* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-22 12:33 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-05-22 12:33 UTC (permalink / raw)
To: Simon Horman
Cc: Magnus Damm, Laurent Pinchart, linux-sh, linux-arm-kernel,
devicetree, Geert Uytterhoeven
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>" to fix this.
Also correct the unit-address for the cpg_clocks node, and add missing
unit-addresses for the mstp*_clks nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
but the similar r8a7778 doesn't.
arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 038c16a18373..dc624e0d7506 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -284,8 +284,8 @@
};
clocks {
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
ranges;
/* External root clock */
@@ -298,9 +298,9 @@
};
/* Special CPG clocks */
- cpg_clocks: cpg_clocks@0xe6150000 {
+ cpg_clocks: cpg_clocks@0xffc80000 {
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",
@@ -342,10 +342,10 @@
};
/* Gate clocks */
- mstp0_clks: mstp0_clks {
+ mstp0_clks: mstp0_clks@ffc80030 {
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>,
@@ -379,10 +379,10 @@
"scif1", "scif0", "i2c3", "i2c2", "i2c1",
"i2c0";
};
- mstp1_clks: mstp1_clks {
+ mstp1_clks: mstp1_clks@ffc80034 {
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>,
@@ -408,10 +408,10 @@
"ether", "sata",
"pcie", "vin3";
};
- mstp3_clks: mstp3_clks {
+ mstp3_clks: mstp3_clks@ffc8003c {
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>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-22 12:33 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-05-22 12:33 UTC (permalink / raw)
To: linux-arm-kernel
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>" to fix this.
Also correct the unit-address for the cpg_clocks node, and add missing
unit-addresses for the mstp*_clks nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
but the similar r8a7778 doesn't.
arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 038c16a18373..dc624e0d7506 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -284,8 +284,8 @@
};
clocks {
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
ranges;
/* External root clock */
@@ -298,9 +298,9 @@
};
/* Special CPG clocks */
- cpg_clocks: cpg_clocks at 0xe6150000 {
+ cpg_clocks: cpg_clocks at 0xffc80000 {
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",
@@ -342,10 +342,10 @@
};
/* Gate clocks */
- mstp0_clks: mstp0_clks {
+ mstp0_clks: mstp0_clks at ffc80030 {
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>,
@@ -379,10 +379,10 @@
"scif1", "scif0", "i2c3", "i2c2", "i2c1",
"i2c0";
};
- mstp1_clks: mstp1_clks {
+ mstp1_clks: mstp1_clks at ffc80034 {
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>,
@@ -408,10 +408,10 @@
"ether", "sata",
"pcie", "vin3";
};
- mstp3_clks: mstp3_clks {
+ mstp3_clks: mstp3_clks at ffc8003c {
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>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
2014-05-22 12:33 ` Geert Uytterhoeven
(?)
@ 2014-05-22 23:08 ` Laurent Pinchart
-1 siblings, 0 replies; 32+ messages in thread
From: Laurent Pinchart @ 2014-05-22 23:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Geert,
Thank you for the patch.
On Thursday 22 May 2014 14:33:16 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>" to fix this.
>
> Also correct the unit-address for the cpg_clocks node, and add missing
> unit-addresses for the mstp*_clks nodes.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> ---
> Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
> but the similar r8a7778 doesn't.
>
> arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index 038c16a18373..dc624e0d7506 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -284,8 +284,8 @@
> };
>
> clocks {
> - #address-cells = <2>;
> - #size-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
This looks good to me.
> ranges;
>
> /* External root clock */
> @@ -298,9 +298,9 @@
> };
>
> /* Special CPG clocks */
> - cpg_clocks: cpg_clocks@0xe6150000 {
> + cpg_clocks: cpg_clocks@0xffc80000 {
No need for a 0x prefix.
> compatible = "renesas,r8a7779-cpg-clocks";
> - reg = <0 0xffc80000 0 0x30>;
> + reg = <0xffc80000 0x30>;
This looks good.
> clocks = <&extal_clk>;
> #clock-cells = <1>;
> clock-output-names = "plla", "z", "zs", "s",
> @@ -342,10 +342,10 @@
> };
>
> /* Gate clocks */
> - mstp0_clks: mstp0_clks {
> + mstp0_clks: mstp0_clks@ffc80030 {
The @address is only mandatory to differentiate between nodes with identical
names. As the node name is supposed to describe the device function, maybe we
could rename it to clocks@ffc80030 ? As you modify the CPG node address above
it might make sense to rename it to clocks@ffc80000 too.
I'm not advocating for a rename now, but as your patch touches the names, I
think they should be fixed properly (or not at all).
> 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>,
> @@ -379,10 +379,10 @@
> "scif1", "scif0", "i2c3", "i2c2", "i2c1",
> "i2c0";
> };
> - mstp1_clks: mstp1_clks {
> + mstp1_clks: mstp1_clks@ffc80034 {
> 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>,
> @@ -408,10 +408,10 @@
> "ether", "sata",
> "pcie", "vin3";
> };
> - mstp3_clks: mstp3_clks {
> + mstp3_clks: mstp3_clks@ffc8003c {
> 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>;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-22 23:08 ` Laurent Pinchart
0 siblings, 0 replies; 32+ messages in thread
From: Laurent Pinchart @ 2014-05-22 23:08 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: devicetree, Simon Horman, Magnus Damm, linux-arm-kernel, linux-sh
Hi Geert,
Thank you for the patch.
On Thursday 22 May 2014 14:33:16 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>" to fix this.
>
> Also correct the unit-address for the cpg_clocks node, and add missing
> unit-addresses for the mstp*_clks nodes.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> ---
> Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
> but the similar r8a7778 doesn't.
>
> arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index 038c16a18373..dc624e0d7506 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -284,8 +284,8 @@
> };
>
> clocks {
> - #address-cells = <2>;
> - #size-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
This looks good to me.
> ranges;
>
> /* External root clock */
> @@ -298,9 +298,9 @@
> };
>
> /* Special CPG clocks */
> - cpg_clocks: cpg_clocks@0xe6150000 {
> + cpg_clocks: cpg_clocks@0xffc80000 {
No need for a 0x prefix.
> compatible = "renesas,r8a7779-cpg-clocks";
> - reg = <0 0xffc80000 0 0x30>;
> + reg = <0xffc80000 0x30>;
This looks good.
> clocks = <&extal_clk>;
> #clock-cells = <1>;
> clock-output-names = "plla", "z", "zs", "s",
> @@ -342,10 +342,10 @@
> };
>
> /* Gate clocks */
> - mstp0_clks: mstp0_clks {
> + mstp0_clks: mstp0_clks@ffc80030 {
The @address is only mandatory to differentiate between nodes with identical
names. As the node name is supposed to describe the device function, maybe we
could rename it to clocks@ffc80030 ? As you modify the CPG node address above
it might make sense to rename it to clocks@ffc80000 too.
I'm not advocating for a rename now, but as your patch touches the names, I
think they should be fixed properly (or not at all).
> 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>,
> @@ -379,10 +379,10 @@
> "scif1", "scif0", "i2c3", "i2c2", "i2c1",
> "i2c0";
> };
> - mstp1_clks: mstp1_clks {
> + mstp1_clks: mstp1_clks@ffc80034 {
> 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>,
> @@ -408,10 +408,10 @@
> "ether", "sata",
> "pcie", "vin3";
> };
> - mstp3_clks: mstp3_clks {
> + mstp3_clks: mstp3_clks@ffc8003c {
> 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>;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-22 23:08 ` Laurent Pinchart
0 siblings, 0 replies; 32+ messages in thread
From: Laurent Pinchart @ 2014-05-22 23:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Geert,
Thank you for the patch.
On Thursday 22 May 2014 14:33:16 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>" to fix this.
>
> Also correct the unit-address for the cpg_clocks node, and add missing
> unit-addresses for the mstp*_clks nodes.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> ---
> Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
> but the similar r8a7778 doesn't.
>
> arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index 038c16a18373..dc624e0d7506 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -284,8 +284,8 @@
> };
>
> clocks {
> - #address-cells = <2>;
> - #size-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
This looks good to me.
> ranges;
>
> /* External root clock */
> @@ -298,9 +298,9 @@
> };
>
> /* Special CPG clocks */
> - cpg_clocks: cpg_clocks at 0xe6150000 {
> + cpg_clocks: cpg_clocks at 0xffc80000 {
No need for a 0x prefix.
> compatible = "renesas,r8a7779-cpg-clocks";
> - reg = <0 0xffc80000 0 0x30>;
> + reg = <0xffc80000 0x30>;
This looks good.
> clocks = <&extal_clk>;
> #clock-cells = <1>;
> clock-output-names = "plla", "z", "zs", "s",
> @@ -342,10 +342,10 @@
> };
>
> /* Gate clocks */
> - mstp0_clks: mstp0_clks {
> + mstp0_clks: mstp0_clks at ffc80030 {
The @address is only mandatory to differentiate between nodes with identical
names. As the node name is supposed to describe the device function, maybe we
could rename it to clocks at ffc80030 ? As you modify the CPG node address above
it might make sense to rename it to clocks at ffc80000 too.
I'm not advocating for a rename now, but as your patch touches the names, I
think they should be fixed properly (or not at all).
> 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>,
> @@ -379,10 +379,10 @@
> "scif1", "scif0", "i2c3", "i2c2", "i2c1",
> "i2c0";
> };
> - mstp1_clks: mstp1_clks {
> + mstp1_clks: mstp1_clks at ffc80034 {
> 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>,
> @@ -408,10 +408,10 @@
> "ether", "sata",
> "pcie", "vin3";
> };
> - mstp3_clks: mstp3_clks {
> + mstp3_clks: mstp3_clks at ffc8003c {
> 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>;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
2014-05-22 23:08 ` Laurent Pinchart
(?)
@ 2014-05-23 6:55 ` Geert Uytterhoeven
-1 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-05-23 6:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Laurent,
On Fri, May 23, 2014 at 1:08 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>> - cpg_clocks: cpg_clocks@0xe6150000 {
>> + cpg_clocks: cpg_clocks@0xffc80000 {
>
> No need for a 0x prefix.
Thanks, missed that one.
>> compatible = "renesas,r8a7779-cpg-clocks";
>> - reg = <0 0xffc80000 0 0x30>;
>> + reg = <0xffc80000 0x30>;
>
> This looks good.
>
>> clocks = <&extal_clk>;
>> #clock-cells = <1>;
>> clock-output-names = "plla", "z", "zs", "s",
>> @@ -342,10 +342,10 @@
>> };
>>
>> /* Gate clocks */
>> - mstp0_clks: mstp0_clks {
>> + mstp0_clks: mstp0_clks@ffc80030 {
>
> The @address is only mandatory to differentiate between nodes with identical
> names. As the node name is supposed to describe the device function, maybe we
> could rename it to clocks@ffc80030 ? As you modify the CPG node address above
> it might make sense to rename it to clocks@ffc80000 too.
Sounds good!
> I'm not advocating for a rename now, but as your patch touches the names, I
> think they should be fixed properly (or not at all).
In hindsight, I should have separated the fix and the "obvious small things",
as the latter are subject to bike-shedding ;-)
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
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-23 6:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-05-23 6:55 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Simon Horman, Magnus Damm, Linux-sh list,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Hi Laurent,
On Fri, May 23, 2014 at 1:08 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>> - cpg_clocks: cpg_clocks@0xe6150000 {
>> + cpg_clocks: cpg_clocks@0xffc80000 {
>
> No need for a 0x prefix.
Thanks, missed that one.
>> compatible = "renesas,r8a7779-cpg-clocks";
>> - reg = <0 0xffc80000 0 0x30>;
>> + reg = <0xffc80000 0x30>;
>
> This looks good.
>
>> clocks = <&extal_clk>;
>> #clock-cells = <1>;
>> clock-output-names = "plla", "z", "zs", "s",
>> @@ -342,10 +342,10 @@
>> };
>>
>> /* Gate clocks */
>> - mstp0_clks: mstp0_clks {
>> + mstp0_clks: mstp0_clks@ffc80030 {
>
> The @address is only mandatory to differentiate between nodes with identical
> names. As the node name is supposed to describe the device function, maybe we
> could rename it to clocks@ffc80030 ? As you modify the CPG node address above
> it might make sense to rename it to clocks@ffc80000 too.
Sounds good!
> I'm not advocating for a rename now, but as your patch touches the names, I
> think they should be fixed properly (or not at all).
In hindsight, I should have separated the fix and the "obvious small things",
as the latter are subject to bike-shedding ;-)
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
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
@ 2014-05-23 6:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-05-23 6:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Laurent,
On Fri, May 23, 2014 at 1:08 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>> - cpg_clocks: cpg_clocks at 0xe6150000 {
>> + cpg_clocks: cpg_clocks at 0xffc80000 {
>
> No need for a 0x prefix.
Thanks, missed that one.
>> compatible = "renesas,r8a7779-cpg-clocks";
>> - reg = <0 0xffc80000 0 0x30>;
>> + reg = <0xffc80000 0x30>;
>
> This looks good.
>
>> clocks = <&extal_clk>;
>> #clock-cells = <1>;
>> clock-output-names = "plla", "z", "zs", "s",
>> @@ -342,10 +342,10 @@
>> };
>>
>> /* Gate clocks */
>> - mstp0_clks: mstp0_clks {
>> + mstp0_clks: mstp0_clks at ffc80030 {
>
> The @address is only mandatory to differentiate between nodes with identical
> names. As the node name is supposed to describe the device function, maybe we
> could rename it to clocks at ffc80030 ? As you modify the CPG node address above
> it might make sense to rename it to clocks at ffc80000 too.
Sounds good!
> I'm not advocating for a rename now, but as your patch touches the names, I
> think they should be fixed properly (or not at all).
In hindsight, I should have separated the fix and the "obvious small things",
as the latter are subject to bike-shedding ;-)
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
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
@ 2014-08-28 8:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-08-28 8:21 UTC (permalink / raw)
To: Simon Horman, Magnus Damm; +Cc: devicetree, linux-sh, Geert Uytterhoeven
Checkpatch says:
ERROR: code indent should use tabs where possible
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7779.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index ddc89000854c..d25ed7b4aece 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -440,10 +440,10 @@
/* Gate clocks */
mstp0_clks: clocks@ffc80030 {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc80030 4>;
clocks = <&cpg_clocks R8A7779_CLK_S>,
- <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_S>,
@@ -477,7 +477,7 @@
};
mstp1_clks: clocks@ffc80034 {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc80034 4>, <0xffc80044 4>;
clocks = <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
@@ -506,7 +506,7 @@
};
mstp3_clks: clocks@ffc8003c {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc8003c 4>;
clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
<&s4_clk>, <&s4_clk>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
@ 2014-08-28 8:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-08-28 8:21 UTC (permalink / raw)
To: Simon Horman, Magnus Damm; +Cc: devicetree, linux-sh, Geert Uytterhoeven
Checkpatch says:
ERROR: code indent should use tabs where possible
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7779.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index ddc89000854c..d25ed7b4aece 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -440,10 +440,10 @@
/* Gate clocks */
mstp0_clks: clocks@ffc80030 {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc80030 4>;
clocks = <&cpg_clocks R8A7779_CLK_S>,
- <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_S>,
@@ -477,7 +477,7 @@
};
mstp1_clks: clocks@ffc80034 {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc80034 4>, <0xffc80044 4>;
clocks = <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
@@ -506,7 +506,7 @@
};
mstp3_clks: clocks@ffc8003c {
compatible = "renesas,r8a7779-mstp-clocks",
- "renesas,cpg-mstp-clocks";
+ "renesas,cpg-mstp-clocks";
reg = <0xffc8003c 4>;
clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
<&s4_clk>, <&s4_clk>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 2/2] ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
2014-08-28 8:21 ` Geert Uytterhoeven
@ 2014-08-28 8:21 ` Geert Uytterhoeven
-1 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-08-28 8:21 UTC (permalink / raw)
To: Simon Horman, Magnus Damm; +Cc: devicetree, linux-sh, Geert Uytterhoeven
Checkpatch says:
ERROR: code indent should use tabs where possible
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 18662aec2ec4..477f8153debd 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -66,7 +66,7 @@
};
vmmc_sdhi0: regulator@2 {
- compatible = "regulator-fixed";
+ compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -75,7 +75,7 @@
};
vmmc_sdhi2: regulator@3 {
- compatible = "regulator-fixed";
+ compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 2/2] ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
@ 2014-08-28 8:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 32+ messages in thread
From: Geert Uytterhoeven @ 2014-08-28 8:21 UTC (permalink / raw)
To: Simon Horman, Magnus Damm; +Cc: devicetree, linux-sh, Geert Uytterhoeven
Checkpatch says:
ERROR: code indent should use tabs where possible
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 18662aec2ec4..477f8153debd 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -66,7 +66,7 @@
};
vmmc_sdhi0: regulator@2 {
- compatible = "regulator-fixed";
+ compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -75,7 +75,7 @@
};
vmmc_sdhi2: regulator@3 {
- compatible = "regulator-fixed";
+ compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH 2/2] ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
2014-08-28 8:21 ` Geert Uytterhoeven
@ 2014-08-29 0:06 ` Simon Horman
-1 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-08-29 0:06 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, devicetree, linux-sh
On Thu, Aug 28, 2014 at 10:21:56AM +0200, Geert Uytterhoeven wrote:
> Checkpatch says:
>
> ERROR: code indent should use tabs where possible
Thanks, I have queued this up.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> index 18662aec2ec4..477f8153debd 100644
> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> @@ -66,7 +66,7 @@
> };
>
> vmmc_sdhi0: regulator@2 {
> - compatible = "regulator-fixed";
> + compatible = "regulator-fixed";
> regulator-name = "SDHI0 Vcc";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> @@ -75,7 +75,7 @@
> };
>
> vmmc_sdhi2: regulator@3 {
> - compatible = "regulator-fixed";
> + compatible = "regulator-fixed";
> regulator-name = "SDHI2 Vcc";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 2/2] ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
@ 2014-08-29 0:06 ` Simon Horman
0 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-08-29 0:06 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, devicetree, linux-sh
On Thu, Aug 28, 2014 at 10:21:56AM +0200, Geert Uytterhoeven wrote:
> Checkpatch says:
>
> ERROR: code indent should use tabs where possible
Thanks, I have queued this up.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> index 18662aec2ec4..477f8153debd 100644
> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> @@ -66,7 +66,7 @@
> };
>
> vmmc_sdhi0: regulator@2 {
> - compatible = "regulator-fixed";
> + compatible = "regulator-fixed";
> regulator-name = "SDHI0 Vcc";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> @@ -75,7 +75,7 @@
> };
>
> vmmc_sdhi2: regulator@3 {
> - compatible = "regulator-fixed";
> + compatible = "regulator-fixed";
> regulator-name = "SDHI2 Vcc";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
2014-08-28 8:21 ` Geert Uytterhoeven
@ 2014-08-29 0:06 ` Simon Horman
-1 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-08-29 0:06 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, devicetree, linux-sh
On Thu, Aug 28, 2014 at 10:21:55AM +0200, Geert Uytterhoeven wrote:
> Checkpatch says:
>
> ERROR: code indent should use tabs where possible
Thanks, I have queued this up.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/arm/boot/dts/r8a7779.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index ddc89000854c..d25ed7b4aece 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -440,10 +440,10 @@
> /* Gate clocks */
> mstp0_clks: clocks@ffc80030 {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc80030 4>;
> clocks = <&cpg_clocks R8A7779_CLK_S>,
> - <&cpg_clocks R8A7779_CLK_P>,
> + <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_S>,
> @@ -477,7 +477,7 @@
> };
> mstp1_clks: clocks@ffc80034 {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc80034 4>, <0xffc80044 4>;
> clocks = <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> @@ -506,7 +506,7 @@
> };
> mstp3_clks: clocks@ffc8003c {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc8003c 4>;
> clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
> <&s4_clk>, <&s4_clk>;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
@ 2014-08-29 0:06 ` Simon Horman
0 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-08-29 0:06 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, devicetree, linux-sh
On Thu, Aug 28, 2014 at 10:21:55AM +0200, Geert Uytterhoeven wrote:
> Checkpatch says:
>
> ERROR: code indent should use tabs where possible
Thanks, I have queued this up.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/arm/boot/dts/r8a7779.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index ddc89000854c..d25ed7b4aece 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -440,10 +440,10 @@
> /* Gate clocks */
> mstp0_clks: clocks@ffc80030 {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc80030 4>;
> clocks = <&cpg_clocks R8A7779_CLK_S>,
> - <&cpg_clocks R8A7779_CLK_P>,
> + <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_S>,
> @@ -477,7 +477,7 @@
> };
> mstp1_clks: clocks@ffc80034 {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc80034 4>, <0xffc80044 4>;
> clocks = <&cpg_clocks R8A7779_CLK_P>,
> <&cpg_clocks R8A7779_CLK_P>,
> @@ -506,7 +506,7 @@
> };
> mstp3_clks: clocks@ffc8003c {
> compatible = "renesas,r8a7779-mstp-clocks",
> - "renesas,cpg-mstp-clocks";
> + "renesas,cpg-mstp-clocks";
> reg = <0xffc8003c 4>;
> clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
> <&s4_clk>, <&s4_clk>;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread