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

Commit 90e09a59 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

ARM: shmobile: use device name for timer clocks 



Move SH-Mobile ARM systems over from the legacy
"clk" member of struct sh_timer_config to using
the device name and clkdev for clock matching.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0fb0834b

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

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[SYMSTP001]), /* SCIFA3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[SYMSTP000]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh_siu", &mstp_clks[SYMSTP231]), /* SIU */

	CLKDEV_CON_ID("cmt1", &mstp_clks[SYMSTP229]), /* CMT10 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[SYMSTP229]), /* CMT10 */

	CLKDEV_DEV_ID("sh_irda", &mstp_clks[SYMSTP225]), /* IRDA */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[SYMSTP223]), /* IIC1 */

	CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[SYMSTP222]), /* USBHS */

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

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */

	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_CON_ID("cmt1", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI2 */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */

	CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP323]), /* USB0 */

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

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */

	CLKDEV_CON_ID("cmt1", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_irda", &mstp_clks[MSTP325]), /* IRDA */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */

	CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP322]), /* USBHS */

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

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static struct sh_timer_config cmt10_platform_data = { 
	.name = "CMT10",

	.channel_offset = 0x10,

	.timer_bit = 0,

	.clk = "r_clk",

	.clockevent_rating = 125,

	.clocksource_rating = 125,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static struct sh_timer_config cmt10_platform_data = { 
	.name = "CMT10",

	.channel_offset = 0x10,

	.timer_bit = 0,

	.clk = "cmt1",

	.clockevent_rating = 125,

	.clocksource_rating = 125,

};