Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1399c195 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 356af68b

arch/sh/kernel/cpu/clock-cpg.c

+4 −1
Original line number Diff line number Diff line
@@ -56,7 +56,10 @@ int __init __deprecated cpg_clk_init(void) 


	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	clk_add_alias("tmu_fck", NULL, "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-tmu-sh3.0", "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-tmu.0", "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-tmu.1", "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-tmu.2", "peripheral_clk", NULL);

	clk_add_alias("mtu2_fck", NULL, "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-cmt-16.0", "peripheral_clk", NULL);

	clk_add_alias("fck", "sh-cmt-32.0", "peripheral_clk", NULL);

arch/sh/kernel/cpu/sh3/setup-sh7705.c

+6 −72
Original line number Diff line number Diff line
@@ -143,25 +143,18 @@ static struct platform_device rtc_device = { 
};



static struct sh_timer_config tmu0_platform_data = {

	.channel_offset = 0x02,

	.timer_bit = 0,

	.clockevent_rating = 200,

	.channels_mask = 7,

};



static struct resource tmu0_resources[] = {

	[0] = {

		.start	= 0xfffffe94,

		.end	= 0xfffffe9f,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

	DEFINE_RES_MEM(0xfffffe90, 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-sh3",

	.id		= 0,

	.dev = {

		.platform_data	= &tmu0_platform_data,
@@ -170,67 +163,10 @@ static struct platform_device tmu0_device = { 
	.num_resources	= ARRAY_SIZE(tmu0_resources),

};



static struct sh_timer_config tmu1_platform_data = {

	.channel_offset = 0xe,

	.timer_bit = 1,

	.clocksource_rating = 200,

};



static struct resource tmu1_resources[] = {

	[0] = {

		.start	= 0xfffffea0,

		.end	= 0xfffffeab,

		.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 = 0x1a,

	.timer_bit = 2,

};



static struct resource tmu2_resources[] = {

	[0] = {

		.start	= 0xfffffeac,

		.end	= 0xfffffebb,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x440),

		.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 platform_device *sh7705_devices[] __initdata = {

	&scif0_device,

	&scif1_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

	&rtc_device,

};
@@ -245,8 +181,6 @@ static struct platform_device *sh7705_early_devices[] __initdata = { 
	&scif0_device,

	&scif1_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

};



void __init plat_early_device_setup(void)

arch/sh/kernel/cpu/sh3/setup-sh770x.c

+6 −72
Original line number Diff line number Diff line
@@ -185,25 +185,18 @@ static struct platform_device scif2_device = { 
#endif



static struct sh_timer_config tmu0_platform_data = {

	.channel_offset = 0x02,

	.timer_bit = 0,

	.clockevent_rating = 200,

	.channels_mask = 7,

};



static struct resource tmu0_resources[] = {

	[0] = {

		.start	= 0xfffffe94,

		.end	= 0xfffffe9f,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

	DEFINE_RES_MEM(0xfffffe90, 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-sh3",

	.id		= 0,

	.dev = {

		.platform_data	= &tmu0_platform_data,
@@ -212,61 +205,6 @@ static struct platform_device tmu0_device = { 
	.num_resources	= ARRAY_SIZE(tmu0_resources),

};



static struct sh_timer_config tmu1_platform_data = {

	.channel_offset = 0xe,

	.timer_bit = 1,

	.clocksource_rating = 200,

};



static struct resource tmu1_resources[] = {

	[0] = {

		.start	= 0xfffffea0,

		.end	= 0xfffffeab,

		.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 = 0x1a,

	.timer_bit = 2,

};



static struct resource tmu2_resources[] = {

	[0] = {

		.start	= 0xfffffeac,

		.end	= 0xfffffebb,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x440),

		.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 platform_device *sh770x_devices[] __initdata = {

	&scif0_device,

#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
@@ -279,8 +217,6 @@ static struct platform_device *sh770x_devices[] __initdata = { 
	&scif2_device,

#endif

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

	&rtc_device,

};
@@ -303,8 +239,6 @@ static struct platform_device *sh770x_early_devices[] __initdata = { 
	&scif2_device,

#endif

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

};



void __init plat_early_device_setup(void)

arch/sh/kernel/cpu/sh3/setup-sh7710.c

+6 −72
Original line number Diff line number Diff line
@@ -142,25 +142,18 @@ static struct platform_device scif1_device = { 
};



static struct sh_timer_config tmu0_platform_data = {

	.channel_offset = 0x02,

	.timer_bit = 0,

	.clockevent_rating = 200,

	.channels_mask = 7,

};



static struct resource tmu0_resources[] = {

	[0] = {

		.start	= 0xa412fe94,

		.end	= 0xa412fe9f,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

	DEFINE_RES_MEM(0xa412fe90, 0x28),

	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-sh3",

	.id		= 0,

	.dev = {

		.platform_data	= &tmu0_platform_data,
@@ -169,67 +162,10 @@ static struct platform_device tmu0_device = { 
	.num_resources	= ARRAY_SIZE(tmu0_resources),

};



static struct sh_timer_config tmu1_platform_data = {

	.channel_offset = 0xe,

	.timer_bit = 1,

	.clocksource_rating = 200,

};



static struct resource tmu1_resources[] = {

	[0] = {

		.start	= 0xa412fea0,

		.end	= 0xa412feab,

		.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 = 0x1a,

	.timer_bit = 2,

};



static struct resource tmu2_resources[] = {

	[0] = {

		.start	= 0xa412feac,

		.end	= 0xa412feb5,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x440),

		.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 platform_device *sh7710_devices[] __initdata = {

	&scif0_device,

	&scif1_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

	&rtc_device,

};
@@ -244,8 +180,6 @@ static struct platform_device *sh7710_early_devices[] __initdata = { 
	&scif0_device,

	&scif1_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

};



void __init plat_early_device_setup(void)

arch/sh/kernel/cpu/sh3/setup-sh7720.c

+6 −72
Original line number Diff line number Diff line
@@ -172,25 +172,18 @@ static struct platform_device cmt_device = { 
};



static struct sh_timer_config tmu0_platform_data = {

	.channel_offset = 0x02,

	.timer_bit = 0,

	.clockevent_rating = 200,

	.channels_mask = 7,

};



static struct resource tmu0_resources[] = {

	[0] = {

		.start	= 0xa412fe94,

		.end	= 0xa412fe9f,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

	DEFINE_RES_MEM(0xa412fe90, 0x28),

	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-sh3",

	.id		= 0,

	.dev = {

		.platform_data	= &tmu0_platform_data,
@@ -199,68 +192,11 @@ static struct platform_device tmu0_device = { 
	.num_resources	= ARRAY_SIZE(tmu0_resources),

};



static struct sh_timer_config tmu1_platform_data = {

	.channel_offset = 0xe,

	.timer_bit = 1,

	.clocksource_rating = 200,

};



static struct resource tmu1_resources[] = {

	[0] = {

		.start	= 0xa412fea0,

		.end	= 0xa412feab,

		.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 = 0x1a,

	.timer_bit = 2,

};



static struct resource tmu2_resources[] = {

	[0] = {

		.start	= 0xa412feac,

		.end	= 0xa412feb5,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x440),

		.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 platform_device *sh7720_devices[] __initdata = {

	&scif0_device,

	&scif1_device,

	&cmt_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

	&rtc_device,

	&usb_ohci_device,

	&usbf_device,
@@ -278,8 +214,6 @@ static struct platform_device *sh7720_early_devices[] __initdata = { 
	&scif1_device,

	&cmt_device,

	&tmu0_device,

	&tmu1_device,

	&tmu2_device,

};



void __init plat_early_device_setup(void)