|
@@ -175,25 +175,18 @@ static struct platform_device scif5_device = {
|
|
|
};
|
|
|
|
|
|
static struct sh_timer_config tmu0_platform_data = {
|
|
|
- .channel_offset = 0x04,
|
|
|
- .timer_bit = 0,
|
|
|
- .clockevent_rating = 200,
|
|
|
+ .channels_mask = 7,
|
|
|
};
|
|
|
|
|
|
static struct resource tmu0_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffd80008,
|
|
|
- .end = 0xffd80013,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x400),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
+ DEFINE_RES_MEM(0xffd80000, 0x30),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x400)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x420)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x440)),
|
|
|
};
|
|
|
|
|
|
static struct platform_device tmu0_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
+ .name = "sh-tmu",
|
|
|
.id = 0,
|
|
|
.dev = {
|
|
|
.platform_data = &tmu0_platform_data,
|
|
@@ -203,25 +196,18 @@ static struct platform_device tmu0_device = {
|
|
|
};
|
|
|
|
|
|
static struct sh_timer_config tmu1_platform_data = {
|
|
|
- .channel_offset = 0x10,
|
|
|
- .timer_bit = 1,
|
|
|
- .clocksource_rating = 200,
|
|
|
+ .channels_mask = 7,
|
|
|
};
|
|
|
|
|
|
static struct resource tmu1_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffd80014,
|
|
|
- .end = 0xffd8001f,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x420),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
+ DEFINE_RES_MEM(0xffda0000, 0x2c),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x480)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x4a0)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x4c0)),
|
|
|
};
|
|
|
|
|
|
static struct platform_device tmu1_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
+ .name = "sh-tmu",
|
|
|
.id = 1,
|
|
|
.dev = {
|
|
|
.platform_data = &tmu1_platform_data,
|
|
@@ -231,24 +217,18 @@ static struct platform_device tmu1_device = {
|
|
|
};
|
|
|
|
|
|
static struct sh_timer_config tmu2_platform_data = {
|
|
|
- .channel_offset = 0x1c,
|
|
|
- .timer_bit = 2,
|
|
|
+ .channels_mask = 7,
|
|
|
};
|
|
|
|
|
|
static struct resource tmu2_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffd80020,
|
|
|
- .end = 0xffd8002f,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x440),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
+ DEFINE_RES_MEM(0xffdc0000, 0x2c),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7a0)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7a0)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7a0)),
|
|
|
};
|
|
|
|
|
|
static struct platform_device tmu2_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
+ .name = "sh-tmu",
|
|
|
.id = 2,
|
|
|
.dev = {
|
|
|
.platform_data = &tmu2_platform_data,
|
|
@@ -258,24 +238,18 @@ static struct platform_device tmu2_device = {
|
|
|
};
|
|
|
|
|
|
static struct sh_timer_config tmu3_platform_data = {
|
|
|
- .channel_offset = 0x04,
|
|
|
- .timer_bit = 0,
|
|
|
+ .channels_mask = 7,
|
|
|
};
|
|
|
|
|
|
static struct resource tmu3_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffda0008,
|
|
|
- .end = 0xffda0013,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x480),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
+ DEFINE_RES_MEM(0xffde0000, 0x2c),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7c0)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7c0)),
|
|
|
+ DEFINE_RES_IRQ(evt2irq(0x7c0)),
|
|
|
};
|
|
|
|
|
|
static struct platform_device tmu3_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
+ .name = "sh-tmu",
|
|
|
.id = 3,
|
|
|
.dev = {
|
|
|
.platform_data = &tmu3_platform_data,
|
|
@@ -284,222 +258,6 @@ static struct platform_device tmu3_device = {
|
|
|
.num_resources = ARRAY_SIZE(tmu3_resources),
|
|
|
};
|
|
|
|
|
|
-static struct sh_timer_config tmu4_platform_data = {
|
|
|
- .channel_offset = 0x10,
|
|
|
- .timer_bit = 1,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu4_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffda0014,
|
|
|
- .end = 0xffda001f,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x4a0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu4_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 4,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu4_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu4_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu4_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu5_platform_data = {
|
|
|
- .channel_offset = 0x1c,
|
|
|
- .timer_bit = 2,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu5_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffda0020,
|
|
|
- .end = 0xffda002b,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x4c0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu5_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 5,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu5_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu5_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu5_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu6_platform_data = {
|
|
|
- .channel_offset = 0x04,
|
|
|
- .timer_bit = 0,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu6_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffdc0008,
|
|
|
- .end = 0xffdc0013,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7a0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu6_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 6,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu6_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu6_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu6_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu7_platform_data = {
|
|
|
- .channel_offset = 0x10,
|
|
|
- .timer_bit = 1,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu7_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffdc0014,
|
|
|
- .end = 0xffdc001f,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7a0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu7_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 7,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu7_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu7_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu7_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu8_platform_data = {
|
|
|
- .channel_offset = 0x1c,
|
|
|
- .timer_bit = 2,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu8_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffdc0020,
|
|
|
- .end = 0xffdc002b,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7a0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu8_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 8,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu8_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu8_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu8_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu9_platform_data = {
|
|
|
- .channel_offset = 0x04,
|
|
|
- .timer_bit = 0,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu9_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffde0008,
|
|
|
- .end = 0xffde0013,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7c0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu9_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 9,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu9_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu9_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu9_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu10_platform_data = {
|
|
|
- .channel_offset = 0x10,
|
|
|
- .timer_bit = 1,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu10_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffde0014,
|
|
|
- .end = 0xffde001f,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7c0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu10_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 10,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu10_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu10_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu10_resources),
|
|
|
-};
|
|
|
-
|
|
|
-static struct sh_timer_config tmu11_platform_data = {
|
|
|
- .channel_offset = 0x1c,
|
|
|
- .timer_bit = 2,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource tmu11_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = 0xffde0020,
|
|
|
- .end = 0xffde002b,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = evt2irq(0x7c0),
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device tmu11_device = {
|
|
|
- .name = "sh_tmu",
|
|
|
- .id = 11,
|
|
|
- .dev = {
|
|
|
- .platform_data = &tmu11_platform_data,
|
|
|
- },
|
|
|
- .resource = tmu11_resources,
|
|
|
- .num_resources = ARRAY_SIZE(tmu11_resources),
|
|
|
-};
|
|
|
-
|
|
|
static const struct sh_dmae_channel dmac0_channels[] = {
|
|
|
{
|
|
|
.offset = 0,
|
|
@@ -641,15 +399,6 @@ static struct platform_device *sh7786_early_devices[] __initdata = {
|
|
|
&tmu0_device,
|
|
|
&tmu1_device,
|
|
|
&tmu2_device,
|
|
|
- &tmu3_device,
|
|
|
- &tmu4_device,
|
|
|
- &tmu5_device,
|
|
|
- &tmu6_device,
|
|
|
- &tmu7_device,
|
|
|
- &tmu8_device,
|
|
|
- &tmu9_device,
|
|
|
- &tmu10_device,
|
|
|
- &tmu11_device,
|
|
|
};
|
|
|
|
|
|
static struct platform_device *sh7786_devices[] __initdata = {
|