diff mbox

ARM: shmobile: r8a7791: fix MSTP8 input clocks

Message ID 4221957.7dd2kFrTHY@wasted.cogentembedded.com (mailing list archive)
State Accepted
Commit 2fd4e094bbe6de0dc98355c4c387c433f6de525c
Delegated to: Simon Horman
Headers show

Commit Message

Sergei Shtylyov Jan. 12, 2015, 10:31 p.m. UTC
I made  a mistake when rebasing Andrey Gusakov's patch adding MLB+ clock to the
R8A7791 device  tree, inserting <&hp_clk> into the "clocks"  property of the
MSTP8 node at a wrong position, so that the input clocks for MLB+ and IPMMU-SGX
got swapped...

Fixes: 7408d3061d2f ("ARM: shmobile: r8a7791: add MLB+ clock")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is against 'renesas-devel-20150108v2-v3.19-rc3' tag of Simon Horman's
'renesas.git' repo.

 arch/arm/boot/dts/r8a7791.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Simon Horman Jan. 13, 2015, 12:36 a.m. UTC | #1
On Tue, Jan 13, 2015 at 01:31:14AM +0300, Sergei Shtylyov wrote:
> I made  a mistake when rebasing Andrey Gusakov's patch adding MLB+ clock to the
> R8A7791 device  tree, inserting <&hp_clk> into the "clocks"  property of the
> MSTP8 node at a wrong position, so that the input clocks for MLB+ and IPMMU-SGX
> got swapped...
> 
> Fixes: 7408d3061d2f ("ARM: shmobile: r8a7791: add MLB+ clock")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> The patch is against 'renesas-devel-20150108v2-v3.19-rc3' tag of Simon Horman's
> 'renesas.git' repo.

Thanks, I have queued this up.

> 
>  arch/arm/boot/dts/r8a7791.dtsi |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
> ===================================================================
> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi
> @@ -1196,7 +1196,7 @@
>  		mstp8_clks: mstp8_clks@e6150990 {
>  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
>  			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
> -			clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
> +			clocks = <&zg_clk>, <&hp_clk>, <&zg_clk>, <&zg_clk>,
>  			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
>  			#clock-cells = <1>;
>  			clock-indices = <
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov Jan. 14, 2015, 7 p.m. UTC | #2
Hello.

On 01/13/2015 03:36 AM, Simon Horman wrote:

>> I made  a mistake when rebasing Andrey Gusakov's patch adding MLB+ clock to the
>> R8A7791 device  tree, inserting <&hp_clk> into the "clocks"  property of the
>> MSTP8 node at a wrong position, so that the input clocks for MLB+ and IPMMU-SGX
>> got swapped...

>> Fixes: 7408d3061d2f ("ARM: shmobile: r8a7791: add MLB+ clock")
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>> ---
>> The patch is against 'renesas-devel-20150108v2-v3.19-rc3' tag of Simon Horman's
>> 'renesas.git' repo.

> Thanks, I have queued this up.

    Thank you! I've just noticed that this patch was atop of several other 
patches in my tree, so there might have been an offset when you applied it.
Sorry about that... :-<

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi
+++ renesas/arch/arm/boot/dts/r8a7791.dtsi
@@ -1196,7 +1196,7 @@ 
 		mstp8_clks: mstp8_clks@e6150990 {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
+			clocks = <&zg_clk>, <&hp_clk>, <&zg_clk>, <&zg_clk>,
 			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <