← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to arch/sh/kernel/cpu/sh2a/setup-sh7203.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
173
173
static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
174
174
                         mask_registers, prio_registers, NULL);
175
175
 
176
 
static struct plat_sci_port sci_platform_data[] = {
177
 
        {
178
 
                .mapbase        = 0xfffe8000,
179
 
                .flags          = UPF_BOOT_AUTOCONF,
180
 
                .type           = PORT_SCIF,
181
 
                .irqs           =  { 192, 192, 192, 192 },
182
 
        }, {
183
 
                .mapbase        = 0xfffe8800,
184
 
                .flags          = UPF_BOOT_AUTOCONF,
185
 
                .type           = PORT_SCIF,
186
 
                .irqs           =  { 196, 196, 196, 196 },
187
 
        }, {
188
 
                .mapbase        = 0xfffe9000,
189
 
                .flags          = UPF_BOOT_AUTOCONF,
190
 
                .type           = PORT_SCIF,
191
 
                .irqs           =  { 200, 200, 200, 200 },
192
 
        }, {
193
 
                .mapbase        = 0xfffe9800,
194
 
                .flags          = UPF_BOOT_AUTOCONF,
195
 
                .type           = PORT_SCIF,
196
 
                .irqs           =  { 204, 204, 204, 204 },
197
 
        }, {
198
 
                .flags = 0,
199
 
        }
200
 
};
201
 
 
202
 
static struct platform_device sci_device = {
203
 
        .name           = "sh-sci",
204
 
        .id             = -1,
205
 
        .dev            = {
206
 
                .platform_data  = sci_platform_data,
 
176
static struct plat_sci_port scif0_platform_data = {
 
177
        .mapbase        = 0xfffe8000,
 
178
        .flags          = UPF_BOOT_AUTOCONF,
 
179
        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
 
180
        .scbrr_algo_id  = SCBRR_ALGO_2,
 
181
        .type           = PORT_SCIF,
 
182
        .irqs           =  { 192, 192, 192, 192 },
 
183
};
 
184
 
 
185
static struct platform_device scif0_device = {
 
186
        .name           = "sh-sci",
 
187
        .id             = 0,
 
188
        .dev            = {
 
189
                .platform_data  = &scif0_platform_data,
 
190
        },
 
191
};
 
192
 
 
193
static struct plat_sci_port scif1_platform_data = {
 
194
        .mapbase        = 0xfffe8800,
 
195
        .flags          = UPF_BOOT_AUTOCONF,
 
196
        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
 
197
        .scbrr_algo_id  = SCBRR_ALGO_2,
 
198
        .type           = PORT_SCIF,
 
199
        .irqs           =  { 196, 196, 196, 196 },
 
200
};
 
201
 
 
202
static struct platform_device scif1_device = {
 
203
        .name           = "sh-sci",
 
204
        .id             = 1,
 
205
        .dev            = {
 
206
                .platform_data  = &scif1_platform_data,
 
207
        },
 
208
};
 
209
 
 
210
static struct plat_sci_port scif2_platform_data = {
 
211
        .mapbase        = 0xfffe9000,
 
212
        .flags          = UPF_BOOT_AUTOCONF,
 
213
        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
 
214
        .scbrr_algo_id  = SCBRR_ALGO_2,
 
215
        .type           = PORT_SCIF,
 
216
        .irqs           =  { 200, 200, 200, 200 },
 
217
};
 
218
 
 
219
static struct platform_device scif2_device = {
 
220
        .name           = "sh-sci",
 
221
        .id             = 2,
 
222
        .dev            = {
 
223
                .platform_data  = &scif2_platform_data,
 
224
        },
 
225
};
 
226
 
 
227
static struct plat_sci_port scif3_platform_data = {
 
228
        .mapbase        = 0xfffe9800,
 
229
        .flags          = UPF_BOOT_AUTOCONF,
 
230
        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
 
231
        .scbrr_algo_id  = SCBRR_ALGO_2,
 
232
        .type           = PORT_SCIF,
 
233
        .irqs           =  { 204, 204, 204, 204 },
 
234
};
 
235
 
 
236
static struct platform_device scif3_device = {
 
237
        .name           = "sh-sci",
 
238
        .id             = 3,
 
239
        .dev            = {
 
240
                .platform_data  = &scif3_platform_data,
207
241
        },
208
242
};
209
243
 
210
244
static struct sh_timer_config cmt0_platform_data = {
211
 
        .name = "CMT0",
212
245
        .channel_offset = 0x02,
213
246
        .timer_bit = 0,
214
 
        .clk = "peripheral_clk",
215
247
        .clockevent_rating = 125,
216
248
        .clocksource_rating = 0, /* disabled due to code generation issues */
217
249
};
218
250
 
219
251
static struct resource cmt0_resources[] = {
220
252
        [0] = {
221
 
                .name   = "CMT0",
222
253
                .start  = 0xfffec002,
223
254
                .end    = 0xfffec007,
224
255
                .flags  = IORESOURCE_MEM,
240
271
};
241
272
 
242
273
static struct sh_timer_config cmt1_platform_data = {
243
 
        .name = "CMT1",
244
274
        .channel_offset = 0x08,
245
275
        .timer_bit = 1,
246
 
        .clk = "peripheral_clk",
247
276
        .clockevent_rating = 125,
248
277
        .clocksource_rating = 0, /* disabled due to code generation issues */
249
278
};
250
279
 
251
280
static struct resource cmt1_resources[] = {
252
281
        [0] = {
253
 
                .name   = "CMT1",
254
282
                .start  = 0xfffec008,
255
283
                .end    = 0xfffec00d,
256
284
                .flags  = IORESOURCE_MEM,
272
300
};
273
301
 
274
302
static struct sh_timer_config mtu2_0_platform_data = {
275
 
        .name = "MTU2_0",
276
303
        .channel_offset = -0x80,
277
304
        .timer_bit = 0,
278
 
        .clk = "peripheral_clk",
279
305
        .clockevent_rating = 200,
280
306
};
281
307
 
282
308
static struct resource mtu2_0_resources[] = {
283
309
        [0] = {
284
 
                .name   = "MTU2_0",
285
310
                .start  = 0xfffe4300,
286
311
                .end    = 0xfffe4326,
287
312
                .flags  = IORESOURCE_MEM,
303
328
};
304
329
 
305
330
static struct sh_timer_config mtu2_1_platform_data = {
306
 
        .name = "MTU2_1",
307
331
        .channel_offset = -0x100,
308
332
        .timer_bit = 1,
309
 
        .clk = "peripheral_clk",
310
333
        .clockevent_rating = 200,
311
334
};
312
335
 
313
336
static struct resource mtu2_1_resources[] = {
314
337
        [0] = {
315
 
                .name   = "MTU2_1",
316
338
                .start  = 0xfffe4380,
317
339
                .end    = 0xfffe4390,
318
340
                .flags  = IORESOURCE_MEM,
354
376
};
355
377
 
356
378
static struct platform_device *sh7203_devices[] __initdata = {
357
 
        &sci_device,
 
379
        &scif0_device,
 
380
        &scif1_device,
 
381
        &scif2_device,
 
382
        &scif3_device,
358
383
        &cmt0_device,
359
384
        &cmt1_device,
360
385
        &mtu2_0_device,
375
400
}
376
401
 
377
402
static struct platform_device *sh7203_early_devices[] __initdata = {
 
403
        &scif0_device,
 
404
        &scif1_device,
 
405
        &scif2_device,
 
406
        &scif3_device,
378
407
        &cmt0_device,
379
408
        &cmt1_device,
380
409
        &mtu2_0_device,