Skip to contentSkip to conversation

ARM: shmobile: r8a7791: fix MSTP8 input clocks

PATCH New Sergei Shtylyov 2 participants 3 messages Jan 12, 2015 – Jan 14, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: fix MSTP8 input clocks

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")

---
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(-)
arch/arm/boot/dts/r8a7791.dtsi +1 -1
Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
@@ -1196,7 +1196,7 @@
 		mstp8_clks: mstp8_clks at 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 = <
#1 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: fix MSTP8 input clocks

Quoted 11 lines · Sergei Shtylyov

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")

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

Thanks, I have queued this up.

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

Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================

arch/arm/boot/dts/r8a7791.dtsi +1 -1
@@ -1196,7 +1196,7 @@
 		mstp8_clks: mstp8_clks at 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 = <
#2 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: fix MSTP8 input clocks

Hello.

Quoted 5 lines · Simon Horman
Quoted 4 lines

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...

Quoted 8 lines
Quoted 6 lines
Fixes 7408d3061d2f ("ARM: shmobile: r8a7791: add MLB+ clock")

---
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