ARM: shmobile: r8a7779/marzen CCF DT updates
Subsystems (2)
v2 cover ARM: shmobile: r8a7779/marzen CCF DT updates
Hi Simon,
Here are a few updates for r8a7779/marzen CCF DT:
- [1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
- [2/2] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
Compared to v1, the old "[2/2] ARM: shmobile: marzen dts: Remove superfluous include" was dropped; a new "[2/2] ARM: shmobile: r8a7779 dtsi:
Update unit-addresses for clocks" was added.
More detailed change logs are included in the individual patches.
This was only compile-tested, due to lack of hardware.
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
PATCH v2 1/2 ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
Warning (ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1) Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)
As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from "<2>" to "<1>", and update the affected "reg" properties to fix this.
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet, but the similar r8a7778 doesn't.
v2:
- Spin off unit-addresses updates into a separate patch.
arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7779.dtsi +6 -6
@@ -284,8 +284,8 @@ }; clocks { - #address-cells = <2>; - #size-cells = <2>; + #address-cells = <1>; + #size-cells = <1>; ranges; /* External root clock */
@@ -300,7 +300,7 @@ /* Special CPG clocks */ cpg_clocks: cpg_clocks at 0xe6150000 { compatible = "renesas,r8a7779-cpg-clocks"; - reg = <0 0xffc80000 0 0x30>; + reg = <0xffc80000 0x30>; clocks = <&extal_clk>; #clock-cells = <1>; clock-output-names = "plla", "z", "zs", "s",
@@ -345,7 +345,7 @@ mstp0_clks: mstp0_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80030 0 4>; + reg = <0xffc80030 4>; clocks = <&cpg_clocks R8A7779_CLK_S>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>,
@@ -382,7 +382,7 @@ mstp1_clks: mstp1_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>; + reg = <0xffc80034 4>, <0xffc80044 4>; clocks = <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_S>,
@@ -411,7 +411,7 @@ mstp3_clks: mstp3_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc8003c 0 4>; + reg = <0xffc8003c 4>; clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>; #clock-cells = <1>;
Signature · 1 line
1.9.1
PATCH v2 1/2 ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
Hi Geert,
Thank you for the patch.
Quoted 8 lines · On Friday 23 May 2014 09:46:19 Geert Uytterhoeven wrote:
Warning (
ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1) Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from "<2>" to "<1>", and update the affected "reg" properties to fix this.
Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 61 lines
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet, but the similar r8a7778 doesn't.v2:
- Spin off unit-addresses updates into a separate patch.arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/boot/dts/r8a7779.dtsi +6
-6@@ -284,8 +284,8 @@ }; clocks { - #address-cells = <2>; - #size-cells = <2>; + #address-cells = <1>; + #size-cells = <1>; ranges; /* External root clock */@@ -300,7 +300,7 @@ /* Special CPG clocks */ cpg_clocks: cpg_clocks at 0xe6150000 { compatible = "renesas,r8a7779-cpg-clocks"; - reg = <0 0xffc80000 0 0x30>; + reg = <0xffc80000 0x30>; clocks = <&extal_clk>; #clock-cells = <1>; clock-output-names = "plla", "z", "zs", "s",@@ -345,7 +345,7 @@ mstp0_clks: mstp0_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80030 0 4>; + reg = <0xffc80030 4>; clocks = <&cpg_clocks R8A7779_CLK_S>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>,@@ -382,7 +382,7 @@ mstp1_clks: mstp1_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>; + reg = <0xffc80034 4>, <0xffc80044 4>; clocks = <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_S>,@@ -411,7 +411,7 @@ mstp3_clks: mstp3_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc8003c 0 4>; + reg = <0xffc8003c 4>; clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>; #clock-cells = <1>;
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 1/2 ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
Quoted 9 lines · Laurent Pinchart
Hi Geert,
Thank you for the patch.
Quoted 4 lines · On Friday 23 May 2014 09:46:19 Geert Uytterhoeven wrote:
Warning (
ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1) Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)
Quoted 6 lines
Quoted 4 lines
As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from "<2>" to "<1>", and update the affected "reg" properties to fix this.
Signed-off-by Geert Uytterhoeven <[email protected]>Acked-by Laurent Pinchart <[email protected]>
Thanks, I will queue this up.
Quoted 67 lines
Quoted 61 lines
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet, but the similar r8a7778 doesn't.v2:
- Spin off unit-addresses updates into a separate patch.arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/boot/dts/r8a7779.dtsi +6
-6@@ -284,8 +284,8 @@ }; clocks { - #address-cells = <2>; - #size-cells = <2>; + #address-cells = <1>; + #size-cells = <1>; ranges; /* External root clock */@@ -300,7 +300,7 @@ /* Special CPG clocks */ cpg_clocks: cpg_clocks at 0xe6150000 { compatible = "renesas,r8a7779-cpg-clocks"; - reg = <0 0xffc80000 0 0x30>; + reg = <0xffc80000 0x30>; clocks = <&extal_clk>; #clock-cells = <1>; clock-output-names = "plla", "z", "zs", "s",@@ -345,7 +345,7 @@ mstp0_clks: mstp0_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80030 0 4>; + reg = <0xffc80030 4>; clocks = <&cpg_clocks R8A7779_CLK_S>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>,@@ -382,7 +382,7 @@ mstp1_clks: mstp1_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>; + reg = <0xffc80034 4>, <0xffc80044 4>; clocks = <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_P>, <&cpg_clocks R8A7779_CLK_S>,@@ -411,7 +411,7 @@ mstp3_clks: mstp3_clks { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xffc8003c 0 4>; + reg = <0xffc8003c 4>; clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>; #clock-cells = <1>;Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/2 ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
In reply to Geert Uytterhoeven - Correct the unit-address for the "cpg_clocks" node,
- Add missing unit-addresses for the "mstp*_clks" nodes,
- Rename "cpg_clocks" and "mstp*_clks" nodes to the more generic
"clocks".
---
v2:
- Spun-off from "ARM: shmobile: r8a7779 dtsi: Correct #address-cells/ #size-cells for clocks".
- Removed "0x" prefix from cpg_clocks unit-address,
- Renamed cpg_clocks and mstp*_clks nodes to the more generic "clocks".
arch/arm/boot/dts/r8a7779.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/r8a7779.dtsi +4 -4
@@ -298,7 +298,7 @@ }; /* Special CPG clocks */ - cpg_clocks: cpg_clocks at 0xe6150000 { + cpg_clocks: clocks at ffc80000 { compatible = "renesas,r8a7779-cpg-clocks"; reg = <0xffc80000 0x30>; clocks = <&extal_clk>;
@@ -342,7 +342,7 @@ }; /* Gate clocks */ - mstp0_clks: mstp0_clks { + mstp0_clks: clocks at ffc80030 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80030 4>;
@@ -379,7 +379,7 @@ "scif1", "scif0", "i2c3", "i2c2", "i2c1", "i2c0"; }; - mstp1_clks: mstp1_clks { + mstp1_clks: clocks at ffc80034 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80034 4>, <0xffc80044 4>;
@@ -408,7 +408,7 @@ "ether", "sata", "pcie", "vin3"; }; - mstp3_clks: mstp3_clks { + mstp3_clks: clocks at ffc8003c { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc8003c 4>;
Signature · 1 line
1.9.1
PATCH v2 2/2 ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
Hi Geert,
Thank you for the patch.
Quoted 6 lines · On Friday 23 May 2014 09:46:20 Geert Uytterhoeven wrote:
- Correct the unit-address for the "
cpg_clocks" node,
- Add missing unit-addresses for the "mstp*_clks" nodes,
- Rename "cpg_clocks" and "mstp*_clks" nodes to the more generic"clocks".Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 50 lines
---
v2:
- Spun-off from "ARM: shmobile: r8a7779 dtsi: Correct #address-cells/ #size-cells for clocks".
- Removed "0x" prefix fromcpg_clocksunit-address,
- Renamedcpg_clocksand mstp*_clks nodes to the more generic "clocks".arch/arm/boot/dts/r8a7779.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/boot/dts/r8a7779.dtsi +4
-4@@ -298,7 +298,7 @@ }; /* Special CPG clocks */ - cpg_clocks: cpg_clocks at 0xe6150000 { + cpg_clocks: clocks at ffc80000 { compatible = "renesas,r8a7779-cpg-clocks"; reg = <0xffc80000 0x30>; clocks = <&extal_clk>;@@ -342,7 +342,7 @@ }; /* Gate clocks */ - mstp0_clks: mstp0_clks { + mstp0_clks: clocks at ffc80030 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80030 4>;@@ -379,7 +379,7 @@ "scif1", "scif0", "i2c3", "i2c2", "i2c1", "i2c0"; }; - mstp1_clks: mstp1_clks { + mstp1_clks: clocks at ffc80034 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80034 4>, <0xffc80044 4>;@@ -408,7 +408,7 @@ "ether", "sata", "pcie", "vin3"; }; - mstp3_clks: mstp3_clks { + mstp3_clks: clocks at ffc8003c { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc8003c 4>;
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/2 ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
Quoted 5 lines · Laurent Pinchart
Hi Geert,
Thank you for the patch.
On Friday 23 May 2014 09:46:20 Geert Uytterhoeven wrote:
Quoted 8 lines
Quoted 6 lines
- Correct the unit-address for the "
cpg_clocks" node,
- Add missing unit-addresses for the "mstp*_clks" nodes,
- Rename "cpg_clocks" and "mstp*_clks" nodes to the more generic"clocks".Signed-off-by Geert Uytterhoeven <[email protected]>Acked-by Laurent Pinchart <[email protected]>
Thanks, I will queue this up.
Quoted 56 lines
Quoted 50 lines
---
v2:
- Spun-off from "ARM: shmobile: r8a7779 dtsi: Correct #address-cells/ #size-cells for clocks".
- Removed "0x" prefix fromcpg_clocksunit-address,
- Renamedcpg_clocksand mstp*_clks nodes to the more generic "clocks".arch/arm/boot/dts/r8a7779.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/boot/dts/r8a7779.dtsi +4
-4@@ -298,7 +298,7 @@ }; /* Special CPG clocks */ - cpg_clocks: cpg_clocks at 0xe6150000 { + cpg_clocks: clocks at ffc80000 { compatible = "renesas,r8a7779-cpg-clocks"; reg = <0xffc80000 0x30>; clocks = <&extal_clk>;@@ -342,7 +342,7 @@ }; /* Gate clocks */ - mstp0_clks: mstp0_clks { + mstp0_clks: clocks at ffc80030 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80030 4>;@@ -379,7 +379,7 @@ "scif1", "scif0", "i2c3", "i2c2", "i2c1", "i2c0"; }; - mstp1_clks: mstp1_clks { + mstp1_clks: clocks at ffc80034 { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc80034 4>, <0xffc80044 4>;@@ -408,7 +408,7 @@ "ether", "sata", "pcie", "vin3"; }; - mstp3_clks: mstp3_clks { + mstp3_clks: clocks at ffc8003c { compatible = "renesas,r8a7779-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0xffc8003c 4>;Signature · 3 lines
Regards, Laurent Pinchart