[GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.16

[GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.16

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

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

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


The following changes since commit 932616eed0308cbebbb20a079e4bed3674bf1117:

  ARM: shmobile: r8a7790: remove old style audio clock (2014-04-14 12:49:43 +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.16

for you to fetch changes up to a505daa501dc3f02b08d0b48b049bce719299b74:

  ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines (2014-05-13 10:16:42 +0900)

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

r8a7791 (R-Car M2) SoC
* Correct SYS-DMAC clock defines

r8a7740 (R-Mobile A1) SoC
* Correct name of DT Ethernet clock

----------------------------------------------------------------
Geert Uytterhoeven (2):
      ARM: shmobile: r8a7740: Correct name of DT Ethernet clock
      ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines

 arch/arm/mach-shmobile/clock-r8a7740.c    | 2 +-
 include/dt-bindings/clock/r8a7791-clock.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

[PATCH 1/2] ARM: shmobile: r8a7740: Correct name of DT Ethernet clock

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

The preferred node name in DT for an Ethernet device is "ethernet".
"sh-eth" was used in preliminary and incomplete bindings.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r8a7740.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index dd989f9..433ec67 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -596,7 +596,7 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh_mmcif",		&mstp_clks[MSTP312]),
 	CLKDEV_DEV_ID("e6bd0000.mmc",		&mstp_clks[MSTP312]),
 	CLKDEV_DEV_ID("r8a7740-gether",		&mstp_clks[MSTP309]),
-	CLKDEV_DEV_ID("e9a00000.sh-eth",	&mstp_clks[MSTP309]),
+	CLKDEV_DEV_ID("e9a00000.ethernet",	&mstp_clks[MSTP309]),
 	CLKDEV_DEV_ID("renesas-tpu-pwm",	&mstp_clks[MSTP304]),
 	CLKDEV_DEV_ID("e6600000.pwm",		&mstp_clks[MSTP304]),
 
-- 
1.8.5.2

[PATCH 2/2] ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

R-Car M2 has two MSTP bits for SYS-DMAC, not one.
Also bring the naming in sync with the documentation.

This issue was introduced in v3.14, in commit
4d8864c9e94ec727f1c675b9f6921525c360334b ("ARM: shmobile: r8a7791: Add
clock index macros for DT sources").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 include/dt-bindings/clock/r8a7791-clock.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index f069bc6..c3b0130 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -43,7 +43,8 @@
 #define R8A7791_CLK_SCIFB1		7
 #define R8A7791_CLK_MSIOF1		8
 #define R8A7791_CLK_SCIFB2		16
-#define R8A7791_CLK_DMAC		18
+#define R8A7791_CLK_SYS_DMAC1		18
+#define R8A7791_CLK_SYS_DMAC0		19
 
 /* MSTP3 */
 #define R8A7791_CLK_TPU0		4
-- 
1.8.5.2

[GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.16

[Olof Johansson]

On Tue, May 13, 2014 at 05:03:28PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of
> Renesas ARM based SoC clock updates for v3.16.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-clock-for-v3.16,
> which you have already pulled.
> 
> 
> The following changes since commit 932616eed0308cbebbb20a079e4bed3674bf1117:
> 
>   ARM: shmobile: r8a7790: remove old style audio clock (2014-04-14 12:49:43 +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.16
> 
> for you to fetch changes up to a505daa501dc3f02b08d0b48b049bce719299b74:
> 
>   ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines (2014-05-13 10:16:42 +0900)
> 
> ----------------------------------------------------------------
> Second Round of Renesas ARM Based SoC Clock Updates for v3.16
> 
> r8a7791 (R-Car M2) SoC
> * Correct SYS-DMAC clock defines
> 
> r8a7740 (R-Mobile A1) SoC
> * Correct name of DT Ethernet clock

Merged, thanks.


-Olof