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

Commit 82711e7b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-clock-cleanup2-for-v3.16' of... 

Merge tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas SoC Clock Cleanups for v3.16" from Simon Horman:

Work from Laurent Pinchart to switch all Renesas platforms to the new style
CMT, MTU2 and TMU device platform data. This is in preparation for
initialising these devices using DT on ARM Based Renesas SoCs.

* tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r7s72100: Switch to new style MTU2 device
  sh: Switch to new style MTU2 device
  ARM: shmobile: r8a7779: Switch to new style TMU device
  ARM: shmobile: r8a7778: Switch to new style TMU device
  ARM: shmobile: r8a7740: Switch to new style TMU device
  ARM: shmobile: sh73a0: Switch to new style TMU device
  ARM: shmobile: sh7372: Switch to new style TMU device
  sh: Switch to new style TMU device
  ARM: shmobile: r8a7791: Switch to new style CMT device
  ARM: shmobile: r8a7790: Switch to new style CMT device
  ARM: shmobile: r8a7740: Switch to new style CMT device
  ARM: shmobile: r8a73a4: Switch to new style CMT device
  ARM: shmobile: sh73a0: Switch to new style CMT device
  ARM: shmobile: sh7372: Switch to new style CMT device
  sh: Switch to new style CMT device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 91f0f06c c17fcfbc

arch/arm/mach-shmobile/board-koelsch-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void __init koelsch_add_du_device(void) 
 * devices until they get moved to DT.

 */

static const struct clk_name clk_names[] __initconst = {

	{ "cmt0", NULL, "sh_cmt.0" },

	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },

	{ "scifa0", NULL, "sh-sci.0" },

	{ "scifa1", NULL, "sh-sci.1" },

	{ "scifb0", NULL, "sh-sci.2" },

arch/arm/mach-shmobile/board-lager-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void __init lager_add_du_device(void) 
 * devices until they get moved to DT.

 */

static const struct clk_name clk_names[] __initconst = {

	{ "cmt0", NULL, "sh_cmt.0" },

	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },

	{ "scifa0", NULL, "sh-sci.0" },

	{ "scifa1", NULL, "sh-sci.1" },

	{ "scifb0", NULL, "sh-sci.2" },

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

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]),

	CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]),

	CLKDEV_DEV_ID("r7s72100-ether", &mstp_clks[MSTP74]),

	CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),



	/* ICK */

	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]),
@@ -215,6 +214,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]),

	CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP33]),

};



void __init r7s72100_clock_init(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("e6560000.i2c", &mstp_clks[MSTP317]),

	CLKDEV_DEV_ID("e6500000.i2c", &mstp_clks[MSTP318]),

	CLKDEV_DEV_ID("e6510000.i2c", &mstp_clks[MSTP323]),

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

	CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.1", &mstp_clks[MSTP329]),

	CLKDEV_DEV_ID("e60b0000.i2c", &mstp_clks[MSTP409]),

	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP410]),

	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP411]),

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

+3 −7
Original line number Diff line number Diff line
@@ -548,15 +548,9 @@ static struct clk_lookup lookups[] = { 


	/* MSTP32 clocks */

	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0",	&mstp_clks[MSTP100]),

	CLKDEV_DEV_ID("sh_tmu.3",		&mstp_clks[MSTP111]),

	CLKDEV_DEV_ID("sh_tmu.4",		&mstp_clks[MSTP111]),

	CLKDEV_DEV_ID("sh_tmu.5",		&mstp_clks[MSTP111]),

	CLKDEV_DEV_ID("i2c-sh_mobile.0",	&mstp_clks[MSTP116]),

	CLKDEV_DEV_ID("fff20000.i2c",		&mstp_clks[MSTP116]),

	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.1",	&mstp_clks[MSTP117]),

	CLKDEV_DEV_ID("sh_tmu.0",		&mstp_clks[MSTP125]),

	CLKDEV_DEV_ID("sh_tmu.1",		&mstp_clks[MSTP125]),

	CLKDEV_DEV_ID("sh_tmu.2",		&mstp_clks[MSTP125]),

	CLKDEV_DEV_ID("sh_mobile_ceu.0",	&mstp_clks[MSTP127]),

	CLKDEV_DEV_ID("sh_mobile_ceu.1",	&mstp_clks[MSTP128]),
@@ -583,7 +577,6 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.6",		&mstp_clks[MSTP230]),

	CLKDEV_DEV_ID("e6cc0000.sci",		&mstp_clks[MSTP230]),



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

	CLKDEV_DEV_ID("sh_fsi2",		&mstp_clks[MSTP328]),

	CLKDEV_DEV_ID("fe1f0000.sound",		&mstp_clks[MSTP328]),

	CLKDEV_DEV_ID("i2c-sh_mobile.1",	&mstp_clks[MSTP323]),
@@ -604,6 +597,9 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("e6870000.sd",		&mstp_clks[MSTP415]),



	/* ICK */

	CLKDEV_ICK_ID("fck",	"sh-tmu.1",		&mstp_clks[MSTP111]),

	CLKDEV_ICK_ID("fck",	"sh-tmu.0",		&mstp_clks[MSTP125]),

	CLKDEV_ICK_ID("fck",	"sh-cmt-48.1",		&mstp_clks[MSTP329]),

	CLKDEV_ICK_ID("host",	"renesas_usbhs",	&mstp_clks[MSTP416]),

	CLKDEV_ICK_ID("func",	"renesas_usbhs",	&mstp_clks[MSTP407]),

	CLKDEV_ICK_ID("phy",	"renesas_usbhs",	&mstp_clks[MSTP406]),