iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: shmobile: r8a7779: Switch to new style TMU device

Browse Source 
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:
Laurent Pinchart 2014-04-23 13:15:20 +02:00 committed by Simon Horman
parent 535ef0d957
commit e4ae34e285
2 changed files with 14 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-shmobile/clock-r8a7779.c
View File

@ -173,9 +173,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */ CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
CLKDEV_DEV_ID("ohci-platform.0", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */ CLKDEV_DEV_ID("ohci-platform.0", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */
CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */ CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]), /* TMU0 */
CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */
CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP016]), /* TMU02 */
CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
CLKDEV_DEV_ID("ffc70000.i2c", &mstp_clks[MSTP030]), /* I2C0 */ CLKDEV_DEV_ID("ffc70000.i2c", &mstp_clks[MSTP030]), /* I2C0 */
CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */ CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */

66
arch/arm/mach-shmobile/setup-r8a7779.c
View File

@ -219,64 +219,25 @@ R8A7779_SCIF(4, 0xffe44000, gic_iid(0x7c));
R8A7779_SCIF(5, 0xffe45000, gic_iid(0x7d)); R8A7779_SCIF(5, 0xffe45000, gic_iid(0x7d));
/* TMU */ /* TMU */
static struct sh_timer_config tmu00_platform_data = { static struct sh_timer_config tmu0_platform_data = {
.name = "TMU00", .channels_mask = 7,
.channel_offset = 0x4,
.timer_bit = 0,
.clockevent_rating = 200,
}; };
static struct resource tmu00_resources[] = { static struct resource tmu0_resources[] = {
[0] = { DEFINE_RES_MEM(0xffd80000, 0x30),
.name = "TMU00", DEFINE_RES_IRQ(gic_iid(0x40)),
.start = 0xffd80008, DEFINE_RES_IRQ(gic_iid(0x41)),
.end = 0xffd80013, DEFINE_RES_IRQ(gic_iid(0x42)),
.flags = IORESOURCE_MEM,
},
[1] = {
.start = gic_iid(0x40),
.flags = IORESOURCE_IRQ,
},
}; };
static struct platform_device tmu00_device = { static struct platform_device tmu0_device = {
.name = "sh_tmu", .name = "sh-tmu",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &tmu00_platform_data, .platform_data = &tmu0_platform_data,
}, },
.resource = tmu00_resources, .resource = tmu0_resources,
.num_resources = ARRAY_SIZE(tmu00_resources), .num_resources = ARRAY_SIZE(tmu0_resources),
};
static struct sh_timer_config tmu01_platform_data = {
.name = "TMU01",
.channel_offset = 0x10,
.timer_bit = 1,
.clocksource_rating = 200,
};
static struct resource tmu01_resources[] = {
[0] = {
.name = "TMU01",
.start = 0xffd80014,
.end = 0xffd8001f,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = gic_iid(0x41),
.flags = IORESOURCE_IRQ,
},
};
static struct platform_device tmu01_device = {
.name = "sh_tmu",
.id = 1,
.dev = {
.platform_data = &tmu01_platform_data,
},
.resource = tmu01_resources,
.num_resources = ARRAY_SIZE(tmu01_resources),
}; };
/* I2C */ /* I2C */
@ -685,8 +646,7 @@ static struct platform_device *r8a7779_devices_dt[] __initdata = {
&scif3_device, &scif3_device,
&scif4_device, &scif4_device,
&scif5_device, &scif5_device,
&tmu00_device, &tmu0_device,
&tmu01_device,
}; };
static struct platform_device *r8a7779_standard_devices[] __initdata = { static struct platform_device *r8a7779_standard_devices[] __initdata = {