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

Commit 386f60aa authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: sh7372: Switch to new style CMT device 



The CMT (Compare Match Timer) 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 9b17e48c

arch/arm/mach-shmobile/clock-sh7372.c

+3 −3
Original line number Diff line number Diff line
@@ -565,10 +565,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("r8a66597_hcd.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("r8a66597_udc.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("sh_cmt.4", &mstp_clks[MSTP405]), /* CMT4 */

	CLKDEV_DEV_ID("sh_cmt.3", &mstp_clks[MSTP404]), /* CMT3 */

	CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */

	CLKDEV_DEV_ID("sh_cmt.2", &mstp_clks[MSTP400]), /* CMT2 */



	/* ICK */

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
@@ -581,6 +578,9 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]),

	CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]),

	CLKDEV_ICK_ID("spu2", "sh_fsi2", &mstp_clks[MSTP223]),

	CLKDEV_ICK_ID("fck", "sh-cmt-32-fast.4", &mstp_clks[MSTP405]), /* CMT4 */

	CLKDEV_ICK_ID("fck", "sh-cmt-32-fast.3", &mstp_clks[MSTP404]), /* CMT3 */

	CLKDEV_ICK_ID("fck", "sh-cmt-32-fast.2", &mstp_clks[MSTP400]), /* CMT2 */

	CLKDEV_ICK_ID("diva", "sh_fsi2", &fsidivs[FSIDIV_A]),

	CLKDEV_ICK_ID("divb", "sh_fsi2", &fsidivs[FSIDIV_B]),

	CLKDEV_ICK_ID("xcka", "sh_fsi2", &fsiack_clk),

arch/arm/mach-shmobile/setup-sh7372.c

+4 −16
Original line number Diff line number Diff line
@@ -119,28 +119,16 @@ SH7372_SCIF(PORT_SCIFB, 6, 0xe6c30000, evt2irq(0x0d60)); 


/* CMT */

static struct sh_timer_config cmt2_platform_data = {

	.name = "CMT2",

	.channel_offset = 0x40,

	.timer_bit = 5,

	.clockevent_rating = 125,

	.clocksource_rating = 125,

	.channels_mask = 0x20,

};



static struct resource cmt2_resources[] = {

	[0] = {

		.name	= "CMT2",

		.start	= 0xe6130040,

		.end	= 0xe613004b,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x0b80), /* CMT2 */

		.flags	= IORESOURCE_IRQ,

	},

	DEFINE_RES_MEM(0xe6130000, 0x50),

	DEFINE_RES_IRQ(evt2irq(0x0b80)),

};



static struct platform_device cmt2_device = {

	.name		= "sh_cmt",

	.name		= "sh-cmt-32-fast",

	.id		= 2,

	.dev = {

		.platform_data	= &cmt2_platform_data,