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

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

[Geert Uytterhoeven]

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>
---
I believe there are no users of the incorrect definition.
---
 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 29b0f3355ffb..b050d18437ce 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.7.9.5

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

[Geert Uytterhoeven]

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>
---
I believe there are no users of the incorrect definition.
---
 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 29b0f3355ffb..b050d18437ce 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.7.9.5

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

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Monday 12 May 2014 20:49:33 Geert Uytterhoeven wrote:
> 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>

> ---
> I believe there are no users of the incorrect definition.
> ---
>  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
> 29b0f3355ffb..b050d18437ce 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

-- 
Regards,

Laurent Pinchart

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

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Monday 12 May 2014 20:49:33 Geert Uytterhoeven wrote:
> 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>

> ---
> I believe there are no users of the incorrect definition.
> ---
>  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
> 29b0f3355ffb..b050d18437ce 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

-- 
Regards,

Laurent Pinchart

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

[Simon Horman]

On Mon, May 12, 2014 at 09:48:59PM +0200, Laurent Pinchart wrote:
> Hi Geert,
> 
> Thank you for the patch.
> 
> On Monday 12 May 2014 20:49:33 Geert Uytterhoeven wrote:
> > 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>
> 
> > ---
> > I believe there are no users of the incorrect definition.

Thanks, I will queue this up.
As there are it does not seem to be very urgent so I will target
it at v3.16.

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

[Simon Horman]

On Mon, May 12, 2014 at 09:48:59PM +0200, Laurent Pinchart wrote:
> Hi Geert,
> 
> Thank you for the patch.
> 
> On Monday 12 May 2014 20:49:33 Geert Uytterhoeven wrote:
> > 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>
> 
> > ---
> > I believe there are no users of the incorrect definition.

Thanks, I will queue this up.
As there are it does not seem to be very urgent so I will target
it at v3.16.

[PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Simon Horman]

There appears to have been some inconsistency and confusion here as on
the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.

Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

This follows the naming pattern of "ARM: shmobile: r8a7794: Correct SDHI
clock base address, labels and output-names".
---
 arch/arm/boot/dts/r8a7791.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6b0cd1b..86862a5 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -880,19 +880,19 @@
 		};
 
 		/* Variable factor clocks */
-		sd1_clk: sd2_clk@e6150078 {
+		sd2_clk: sd2_clk@e6150078 {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
 			reg = <0 0xe6150078 0 4>;
 			clocks = <&pll1_div2_clk>;
 			#clock-cells = <0>;
-			clock-output-names = "sd1";
+			clock-output-names = "sd2";
 		};
-		sd2_clk: sd3_clk@e615026c {
+		sd3_clk: sd3_clk@e615026c {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
 			reg = <0 0xe615026c 0 4>;
 			clocks = <&pll1_div2_clk>;
 			#clock-cells = <0>;
-			clock-output-names = "sd2";
+			clock-output-names = "sd3";
 		};
 		mmc0_clk: mmc0_clk@e6150240 {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
@@ -1113,7 +1113,7 @@
 		mstp3_clks: mstp3_clks@e615013c {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
-			clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
+			clocks = <&cp_clk>, <&sd3_clk>, <&sd2_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
 				 <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,
 				 <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
-- 
2.1.4

[PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Simon Horman]

There appears to have been some inconsistency and confusion here as on
the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.

Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

This follows the naming pattern of "ARM: shmobile: r8a7794: Correct SDHI
clock base address, labels and output-names".
---
 arch/arm/boot/dts/r8a7791.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6b0cd1b..86862a5 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -880,19 +880,19 @@
 		};
 
 		/* Variable factor clocks */
-		sd1_clk: sd2_clk at e6150078 {
+		sd2_clk: sd2_clk at e6150078 {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
 			reg = <0 0xe6150078 0 4>;
 			clocks = <&pll1_div2_clk>;
 			#clock-cells = <0>;
-			clock-output-names = "sd1";
+			clock-output-names = "sd2";
 		};
-		sd2_clk: sd3_clk at e615026c {
+		sd3_clk: sd3_clk at e615026c {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
 			reg = <0 0xe615026c 0 4>;
 			clocks = <&pll1_div2_clk>;
 			#clock-cells = <0>;
-			clock-output-names = "sd2";
+			clock-output-names = "sd3";
 		};
 		mmc0_clk: mmc0_clk at e6150240 {
 			compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
@@ -1113,7 +1113,7 @@
 		mstp3_clks: mstp3_clks at e615013c {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
-			clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
+			clocks = <&cp_clk>, <&sd3_clk>, <&sd2_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
 				 <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,
 				 <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
-- 
2.1.4

Re: [PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Geert Uytterhoeven]

On Thu, Jan 29, 2015 at 2:47 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> There appears to have been some inconsistency and confusion here as on
> the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
> the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.
>
> Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Geert Uytterhoeven]

On Thu, Jan 29, 2015 at 2:47 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> There appears to have been some inconsistency and confusion here as on
> the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
> the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.
>
> Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Simon Horman]

On Thu, Jan 29, 2015 at 09:05:15AM +0100, Geert Uytterhoeven wrote:
> On Thu, Jan 29, 2015 at 2:47 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > There appears to have been some inconsistency and confusion here as on
> > the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
> > the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.
> >
> > Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I have queued this up.

[PATCH] ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names

[Simon Horman]

On Thu, Jan 29, 2015 at 09:05:15AM +0100, Geert Uytterhoeven wrote:
> On Thu, Jan 29, 2015 at 2:47 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > There appears to have been some inconsistency and confusion here as on
> > the r8a7790 these clocks are referred to as SD(HI)1 and SD(HI)2 while on
> > the r8a7791 and r8a7794 they are referred to as SD(HI)2 and SD(HI)3.
> >
> > Fixes: 59e79895b95892863 ("ARM: shmobile: r8a7791: Add clocks")
> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I have queued this up.