Second Round of Renesas ARM Based SoC Clock Updates for v3.17

GIT PULL New Simon Horman 4 participants 8 messages Jul 15, 2014 – Jul 19, 2014

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Simon Horman

author

2014-07-15 09:16 UTC #0 lore raw

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC clock updates for v3.17.

This pull request is based on the previous round of such requests, tagged as renesas-clock-for-v3.17, which you have already pulled into next/soc.

CCF support for the SoCs in question is being worked on, so I expect this code to be a temporary measure.

The following changes since commit edc8fb1d6ebdfc4efa009073586d3567c3368475:

ARM: shmobile: Fix device node reference leakage in shmobile_init_delay (2014-06-16 19:52:00 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17

for you to fetch changes up to ff4ce48e1f163d945c037c1c90ce12950961d91d:

ARM: shmobile: sh73a0: add SCI clock support for DT (2014-07-12 15:15:39 +0200)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Clock Updates for v3.17

* Add legacy clocks for SCI for SoCs that do not yet have CCF support. This is to allow SCI (serial) devices to be enabled using DT and will be removed after CCF support is added for each SoC.

----------------------------------------------------------------
Simon Horman (4):
ARM: shmobile: r8a7778: add SCI clock support for DT
ARM: shmobile: r8a73a4: add SCI clock support for DT
ARM: shmobile: r8a7740: correct SCI clock support for DT
ARM: shmobile: sh73a0: add SCI clock support for DT

 arch/arm/mach-shmobile/clock-r8a73a4.c |  6 ++++++
 arch/arm/mach-shmobile/clock-r8a7740.c | 18 +++++++++---------
 arch/arm/mach-shmobile/clock-r8a7778.c |  6 ++++++
 arch/arm/mach-shmobile/clock-sh73a0.c  |  9 +++++++++
 4 files changed, 30 insertions(+), 9 deletions(-)

Simon Horman

author

2014-07-15 09:16 UTC #1 lore raw

PATCH 1/4 ARM: shmobile: r8a7778: add SCI clock support for DT

This will be used when initialising SCI devices using DT until common clock framework support is added.

Acked-by Laurent Pinchart <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/clock-r8a7778.c | 6 ++++++
 1 file changed, 6 insertions(+)

arch/arm/mach-shmobile/clock-r8a7778.c +6 -0

index 13f8f3a..a6dd601 100644
@@ -202,11 +202,17 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
 	CLKDEV_DEV_ID("ffc73000.i2c", &mstp_clks[MSTP027]), /* I2C3 */
 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
+	CLKDEV_DEV_ID("ffe40000.serial", &mstp_clks[MSTP026]), /* SCIF0 */
 	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
+	CLKDEV_DEV_ID("ffe41000.serial", &mstp_clks[MSTP025]), /* SCIF1 */
 	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
+	CLKDEV_DEV_ID("ffe42000.serial", &mstp_clks[MSTP024]), /* SCIF2 */
 	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
+	CLKDEV_DEV_ID("ffe43000.serial", &mstp_clks[MSTP023]), /* SCIF3 */
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
+	CLKDEV_DEV_ID("ffe44000.serial", &mstp_clks[MSTP022]), /* SCIF4 */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
+	CLKDEV_DEV_ID("ffe45000.serial", &mstp_clks[MSTP021]), /* SCIF5 */
 	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
 	CLKDEV_DEV_ID("fffc7000.spi", &mstp_clks[MSTP007]), /* HSPI0 */
 	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */

Signature · 1 line

2.0.0

Simon Horman

author

2014-07-15 09:16 UTC #2 lore raw

PATCH 2/4 ARM: shmobile: r8a73a4: add SCI clock support for DT

In reply to Simon Horman

This will be used when initialising SCI devices using DT until common clock framework support is added.

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/clock-r8a73a4.c | 6 ++++++
 1 file changed, 6 insertions(+)

arch/arm/mach-shmobile/clock-r8a73a4.c +6 -0

index b5bc22c..1d2fe05 100644
@@ -574,11 +574,17 @@ static struct clk_lookup lookups[] = {
 
 	/* MSTP */
 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]),
+	CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]),
 	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]),
+	CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]),
 	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]),
+	CLKDEV_DEV_ID("e6c20000.serial", &mstp_clks[MSTP206]),
 	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]),
+	CLKDEV_DEV_ID("e6c30000.serial", &mstp_clks[MSTP207]),
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),
+	CLKDEV_DEV_ID("e6ce0000.serial", &mstp_clks[MSTP216]),
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),
+	CLKDEV_DEV_ID("e6cf0000.serial", &mstp_clks[MSTP217]),
 	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]),
 	CLKDEV_DEV_ID("e6700020.dma-controller", &mstp_clks[MSTP218]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

Signature · 1 line

2.0.0

Simon Horman

author

2014-07-15 09:16 UTC #3 lore raw

PATCH 3/4 ARM: shmobile: r8a7740: correct SCI clock support for DT

In reply to Simon Horman

When initialising SCI devices their names will be .serial not .sci.

This will be used when initialising SCI devices using DT until common clock framework support is added.

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/clock-r8a7740.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

index 50931e3..68592b7 100644
@@ -555,27 +555,27 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh_mobile_ceu.1",	&mstp_clks[MSTP128]),
 
 	CLKDEV_DEV_ID("sh-sci.4",		&mstp_clks[MSTP200]),
-	CLKDEV_DEV_ID("e6c80000.sci",		&mstp_clks[MSTP200]),
+	CLKDEV_DEV_ID("e6c80000.serial",	&mstp_clks[MSTP200]),
 	CLKDEV_DEV_ID("sh-sci.3",		&mstp_clks[MSTP201]),
-	CLKDEV_DEV_ID("e6c70000.sci",		&mstp_clks[MSTP201]),
+	CLKDEV_DEV_ID("e6c70000.serial",	&mstp_clks[MSTP201]),
 	CLKDEV_DEV_ID("sh-sci.2",		&mstp_clks[MSTP202]),
-	CLKDEV_DEV_ID("e6c60000.sci",		&mstp_clks[MSTP202]),
+	CLKDEV_DEV_ID("e6c60000.serial",	&mstp_clks[MSTP202]),
 	CLKDEV_DEV_ID("sh-sci.1",		&mstp_clks[MSTP203]),
-	CLKDEV_DEV_ID("e6c50000.sci",		&mstp_clks[MSTP203]),
+	CLKDEV_DEV_ID("e6c50000.serial",	&mstp_clks[MSTP203]),
 	CLKDEV_DEV_ID("sh-sci.0",		&mstp_clks[MSTP204]),
-	CLKDEV_DEV_ID("e6c40000.sci",		&mstp_clks[MSTP204]),
+	CLKDEV_DEV_ID("e6c40000.serial",	&mstp_clks[MSTP204]),
 	CLKDEV_DEV_ID("sh-sci.8",		&mstp_clks[MSTP206]),
-	CLKDEV_DEV_ID("e6c30000.sci",		&mstp_clks[MSTP206]),
+	CLKDEV_DEV_ID("e6c30000.serial",	&mstp_clks[MSTP206]),
 	CLKDEV_DEV_ID("sh-sci.5",		&mstp_clks[MSTP207]),
-	CLKDEV_DEV_ID("e6cb0000.sci",		&mstp_clks[MSTP207]),
+	CLKDEV_DEV_ID("e6cb0000.serial",	&mstp_clks[MSTP207]),
 	CLKDEV_DEV_ID("sh-dma-engine.3",	&mstp_clks[MSTP214]),
 	CLKDEV_DEV_ID("sh-dma-engine.2",	&mstp_clks[MSTP216]),
 	CLKDEV_DEV_ID("sh-dma-engine.1",	&mstp_clks[MSTP217]),
 	CLKDEV_DEV_ID("sh-dma-engine.0",	&mstp_clks[MSTP218]),
 	CLKDEV_DEV_ID("sh-sci.7",		&mstp_clks[MSTP222]),
-	CLKDEV_DEV_ID("e6cd0000.sci",		&mstp_clks[MSTP222]),
+	CLKDEV_DEV_ID("e6cd0000.serial",	&mstp_clks[MSTP222]),
 	CLKDEV_DEV_ID("sh-sci.6",		&mstp_clks[MSTP230]),
-	CLKDEV_DEV_ID("e6cc0000.sci",		&mstp_clks[MSTP230]),
+	CLKDEV_DEV_ID("e6cc0000.serial",	&mstp_clks[MSTP230]),
 
 	CLKDEV_DEV_ID("sh_fsi2",		&mstp_clks[MSTP328]),
 	CLKDEV_DEV_ID("fe1f0000.sound",		&mstp_clks[MSTP328]),

Signature · 1 line

2.0.0

Simon Horman

author

2014-07-15 09:16 UTC #4 lore raw

PATCH 4/4 ARM: shmobile: sh73a0: add SCI clock support for DT

In reply to Simon Horman

This will be used when initialising SCI devices using DT until common clock framework support is added.

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/clock-sh73a0.c | 9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/mach-shmobile/clock-sh73a0.c +9 -0

index 0d9cd1f..4990e03 100644
@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
 	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
 	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
+	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */
 	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
 	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
+	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
+	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
+	CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */
 	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */
+	CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]), /* SCIFA1 */
 	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */
+	CLKDEV_DEV_ID("e6c60000.serial", &mstp_clks[MSTP202]), /* SCIFA2 */
 	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */
+	CLKDEV_DEV_ID("e6c70000.serial", &mstp_clks[MSTP201]), /* SCIFA3 */
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */
+	CLKDEV_DEV_ID("e6c80000.serial", &mstp_clks[MSTP200]), /* SCIFA4 */
 	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */
+	CLKDEV_DEV_ID("e6cc0000.serial", &mstp_clks[MSTP331]), /* SCIFA6 */
 	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */
 	CLKDEV_DEV_ID("ec230000.sound", &mstp_clks[MSTP328]), /* FSI */
 	CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */

Signature · 1 line

2.0.0

Sergei Shtylyov

2014-07-15 13:19 UTC #5 lore raw

PATCH 4/4 ARM: shmobile: sh73a0: add SCI clock support for DT

Hello.

Quoted 13 lines · Simon Horman

This will be used when initialising SCI devices using DT until common clock framework support is added.
Signed-off-by Simon Horman <[email protected]>
---
  arch/arm/mach-shmobile/clock-sh73a0.c | 9 +++++++++
  1 file changed, 9 insertions(+)
arch/arm/mach-shmobile/clock-sh73a0.c +0 -0
index 0d9cd1f..4990e03 100644

arch/arm/mach-shmobile/clock-sh73a0.c static struct clk_lookup lookups[] = { · line 647

Quoted 10 lines

arch/arm/mach-shmobile/clock-sh73a0.c +3 -0

@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
  	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
  	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
  	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
+	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */
  	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
  	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
+	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
  	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
+	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */

    Eh, are you sure there should be "0x"?

WBR, Sergei

Simon Horman

2014-07-15 23:52 UTC #6 lore raw

PATCH 4/4 ARM: shmobile: sh73a0: add SCI clock support for DT

Quoted 21 lines · Sergei Shtylyov

Hello.
Quoted 17 lines · Simon Horman
This will be used when initialising SCI devices using DT until common clock framework support is added.
Signed-off-by Simon Horman <[email protected]>
---
 arch/arm/mach-shmobile/clock-sh73a0.c | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/mach-shmobile/clock-sh73a0.c +1 -0
index 0d9cd1f..4990e03 100644
@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
 	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
 	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
+	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */

Quoted 8 lines

arch/arm/mach-shmobile/clock-sh73a0.c static struct clk_lookup lookups[] = { · line 647

Quoted 6 lines

arch/arm/mach-shmobile/clock-sh73a0.c +2 -0

 	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
 	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
+	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
+	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */

Eh, are you sure there should be "0x"?

Thanks, I'll clean that up in a follow-up patch.

Olof Johansson

Applied

2014-07-19 04:31 UTC #7 lore raw

In reply to Simon Horman

Quoted 16 lines · Simon Horman

Hi Olof, Hi Kevin, Hi Arnd,
Please consider these second round of Renesas ARM based SoC clock updates for v3.17.
This pull request is based on the previous round of such requests, tagged as renesas-clock-for-v3.17, which you have already pulled into next/soc.
CCF support for the SoCs in question is being worked on, so I expect this code to be a temporary measure.
The following changes since commit edc8fb1d6ebdfc4efa009073586d3567c3368475:
ARM: shmobile: Fix device node reference leakage in shmobile_init_delay (2014-06-16 19:52:00 +0900)

Quoted 7 lines

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17
for you to fetch changes up to ff4ce48e1f163d945c037c1c90ce12950961d91d:
ARM: shmobile: sh73a0: add SCI clock support for DT (2014-07-12 15:15:39 +0200)

Merged, thanks.

-Olof