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>
This commit is contained in:

committed by
Simon Horman

szülő
356af68bf4
commit
1399c195ef
@@ -432,25 +432,18 @@ static struct platform_device cmt_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, 0x2c),
|
||||
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,
|
||||
@@ -459,61 +452,6 @@ static struct platform_device tmu0_device = {
|
||||
.num_resources = ARRAY_SIZE(tmu0_resources),
|
||||
};
|
||||
|
||||
static struct sh_timer_config tmu1_platform_data = {
|
||||
.channel_offset = 0x10,
|
||||
.timer_bit = 1,
|
||||
.clocksource_rating = 200,
|
||||
};
|
||||
|
||||
static struct resource tmu1_resources[] = {
|
||||
[0] = {
|
||||
.start = 0xffd80014,
|
||||
.end = 0xffd8001f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = evt2irq(0x420),
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device tmu1_device = {
|
||||
.name = "sh_tmu",
|
||||
.id = 1,
|
||||
.dev = {
|
||||
.platform_data = &tmu1_platform_data,
|
||||
},
|
||||
.resource = tmu1_resources,
|
||||
.num_resources = ARRAY_SIZE(tmu1_resources),
|
||||
};
|
||||
|
||||
static struct sh_timer_config tmu2_platform_data = {
|
||||
.channel_offset = 0x1c,
|
||||
.timer_bit = 2,
|
||||
};
|
||||
|
||||
static struct resource tmu2_resources[] = {
|
||||
[0] = {
|
||||
.start = 0xffd80020,
|
||||
.end = 0xffd8002b,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
.start = 18,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device tmu2_device = {
|
||||
.name = "sh_tmu",
|
||||
.id = 2,
|
||||
.dev = {
|
||||
.platform_data = &tmu2_platform_data,
|
||||
},
|
||||
.resource = tmu2_resources,
|
||||
.num_resources = ARRAY_SIZE(tmu2_resources),
|
||||
};
|
||||
|
||||
static struct siu_platform siu_platform_data = {
|
||||
.dma_slave_tx_a = SHDMA_SLAVE_SIUA_TX,
|
||||
.dma_slave_rx_a = SHDMA_SLAVE_SIUA_RX,
|
||||
@@ -549,8 +487,6 @@ static struct platform_device *sh7722_devices[] __initdata = {
|
||||
&scif2_device,
|
||||
&cmt_device,
|
||||
&tmu0_device,
|
||||
&tmu1_device,
|
||||
&tmu2_device,
|
||||
&rtc_device,
|
||||
&usbf_device,
|
||||
&iic_device,
|
||||
@@ -578,8 +514,6 @@ static struct platform_device *sh7722_early_devices[] __initdata = {
|
||||
&scif2_device,
|
||||
&cmt_device,
|
||||
&tmu0_device,
|
||||
&tmu1_device,
|
||||
&tmu2_device,
|
||||
};
|
||||
|
||||
void __init plat_early_device_setup(void)
|
||||
|
Reference in New Issue
Block a user