sh: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that handles the timer as a single device with multiple channel. Switch from the old-style platform data to the new-style platform data. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
这个提交包含在：
Laurent Pinchart
@@ -226,25 +226,18 @@ static struct platform_device scif9_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,
|
||||
@@ -254,25 +247,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(0xffd81000, 0x30),
|
||||
DEFINE_RES_IRQ(evt2irq(0x460)),
|
||||
DEFINE_RES_IRQ(evt2irq(0x480)),
|
||||
DEFINE_RES_IRQ(evt2irq(0x4a0)),
|
||||
};
|
||||
|
||||
static struct platform_device tmu1_device = {
|
||||
.name = "sh_tmu",
|
||||
.name = "sh-tmu",
|
||||
.id = 1,
|
||||
.dev = {
|
||||
.platform_data = &tmu1_platform_data,
|
||||
@@ -282,24 +268,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(0xffd82000, 0x2c),
|
||||
DEFINE_RES_IRQ(evt2irq(0x4c0)),
|
||||
DEFINE_RES_IRQ(evt2irq(0x4e0)),
|
||||
DEFINE_RES_IRQ(evt2irq(0x500)),
|
||||
};
|
||||
|
||||
static struct platform_device tmu2_device = {
|
||||
.name = "sh_tmu",
|
||||
.name = "sh-tmu",
|
||||
.id = 2,
|
||||
.dev = {
|
||||
.platform_data = &tmu2_platform_data,
|
||||
@@ -308,168 +288,6 @@ static struct platform_device tmu2_device = {
|
||||
.num_resources = ARRAY_SIZE(tmu2_resources),
|
||||
};
|
||||
|
||||
static struct sh_timer_config tmu3_platform_data = {
|
||||
.channel_offset = 0x04,
|
||||
.timer_bit = 0,
|
||||
};
|
||||
|
||||
static struct resource tmu3_resources[] = {
|
||||
[0] = {
|
||||
.start = 0xffd81008,
|
||||
.end = 0xffd81013,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x460),
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device tmu3_device = {
|
||||
.name = "sh_tmu",
|
||||
.id = 3,
|
||||
.dev = {
|
||||
.platform_data = &tmu3_platform_data,
|
||||
},
|
||||
.resource = tmu3_resources,
|
||||
.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 = 0xffd81014,
|
||||
.end = 0xffd8101f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x480),
|
||||
.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 = 0xffd81020,
|
||||
.end = 0xffd8102f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x4a0),
|
||||
.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 = 0xffd82008,
|
||||
.end = 0xffd82013,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x4c0),
|
||||
.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 = 0xffd82014,
|
||||
.end = 0xffd8201f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x4e0),
|
||||
.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 = 0xffd82020,
|
||||
.end = 0xffd8202b,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x500),
|
||||
.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 platform_device *sh7770_devices[] __initdata = {
|
||||
&scif0_device,
|
||||
&scif1_device,
|
||||
@@ -484,12 +302,6 @@ static struct platform_device *sh7770_devices[] __initdata = {
|
||||
&tmu0_device,
|
||||
&tmu1_device,
|
||||
&tmu2_device,
|
||||
&tmu3_device,
|
||||
&tmu4_device,
|
||||
&tmu5_device,
|
||||
&tmu6_device,
|
||||
&tmu7_device,
|
||||
&tmu8_device,
|
||||
};
|
||||
|
||||
static int __init sh7770_devices_setup(void)
|
||||
@@ -513,12 +325,6 @@ static struct platform_device *sh7770_early_devices[] __initdata = {
|
||||
&tmu0_device,
|
||||
&tmu1_device,
|
||||
&tmu2_device,
|
||||
&tmu3_device,
|
||||
&tmu4_device,
|
||||
&tmu5_device,
|
||||
&tmu6_device,
|
||||
&tmu7_device,
|
||||
&tmu8_device,
|
||||
};
|
||||
|
||||
void __init plat_early_device_setup(void)
|
||||
|
||||
在新工单中引用
屏蔽一个用户