Fix avoid_unnecessary_addr_size DTC warning with 'clocks' node
Subsystems (2)
cover Fix avoid_unnecessary_addr_size DTC warning with 'clocks' node
The series is to clean up avoid_unnecessary_addr_size DTC warning seen with 'clocks' container node in i.MX dts files.
Shawn Guo (4):
ARM: dts: imx: drop unnecessary #address-cells/#size-cells
ARM: dts: imx1: move clk32 clock into soc dtsi
ARM: dts: imx27: use lable to override osc26m clock setting
ARM: dts: imx: drop 'clocks' container for board level clocks
arch/arm/boot/dts/imx1-ads.dts | 11 ----------- arch/arm/boot/dts/imx1.dtsi | 8 ++++++++ arch/arm/boot/dts/imx25.dtsi | 3 --- arch/arm/boot/dts/imx27-apf27.dts | 13 +++---------- arch/arm/boot/dts/imx27.dtsi | 5 +---- arch/arm/boot/dts/imx28-tx28.dts | 13 ++++--------- arch/arm/boot/dts/imx50.dtsi | 3 --- arch/arm/boot/dts/imx51.dtsi | 3 --- arch/arm/boot/dts/imx53-tx53.dtsi | 11 +++++------ arch/arm/boot/dts/imx53.dtsi | 3 --- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++--------- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 ++++------- arch/arm/boot/dts/imx6qdl.dtsi | 3 --- arch/arm/boot/dts/imx6sl.dtsi | 3 --- 14 files changed, 31 insertions(+), 74 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/4 ARM: dts: imx: drop unnecessary #address-cells/#size-cells
It drops unnecessary #address-cells/#size-cells from <soc>.dtsi 'clocks' node to fix DTC warning avoid_unnecessary_addr_size seen with W=1 switch.
--- arch/arm/boot/dts/imx25.dtsi | 3 --- arch/arm/boot/dts/imx27.dtsi | 3 --- arch/arm/boot/dts/imx50.dtsi | 3 --- arch/arm/boot/dts/imx51.dtsi | 3 --- arch/arm/boot/dts/imx53.dtsi | 3 --- arch/arm/boot/dts/imx6qdl.dtsi | 3 --- arch/arm/boot/dts/imx6sl.dtsi | 3 --- 7 files changed, 21 deletions(-)
arch/arm/boot/dts/imx25.dtsi +0 -3
@@ -70,9 +70,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - osc { compatible = "fsl,imx-osc", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx27.dtsi +0 -3
@@ -57,9 +57,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - osc26m { compatible = "fsl,imx-osc26m", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx50.dtsi +0 -3
@@ -60,9 +60,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx51.dtsi +0 -3
@@ -56,9 +56,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx53.dtsi +0 -3
@@ -88,9 +88,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx6qdl.dtsi +0 -3
@@ -58,9 +58,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>;
arch/arm/boot/dts/imx6sl.dtsi +0 -3
@@ -86,9 +86,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fixed-clock"; #clock-cells = <0>;
Signature · 1 line
1.9.1
PATCH 2/4 ARM: dts: imx1: move clk32 clock into soc dtsi
In reply to Shawn GuoThe clk32 clock is an input clock to CCM module, and should be defined in soc dtsi rather than a board level dts. Let's move it into imx1.dtsi.
While at it, let's drop unnecessary #address-cells/#size-cells from 'clocks' node to DTC warning avoid_unnecessary_addr_size seen with W=1 switch.
--- arch/arm/boot/dts/imx1-ads.dts | 11 ----------- arch/arm/boot/dts/imx1.dtsi | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-)
arch/arm/boot/dts/imx1-ads.dts +0 -11
@@ -23,17 +23,6 @@ memory at 8000000 { reg = <0x08000000 0x04000000>; }; - - clocks { - #address-cells = <1>; - #size-cells = <0>; - - clk32 { - compatible = "fsl,imx-clk32", "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32000>; - }; - }; }; &cspi1 {
arch/arm/boot/dts/imx1.dtsi +8 -0
@@ -62,6 +62,14 @@ }; }; + clocks { + clk32 { + compatible = "fsl,imx-clk32", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32000>; + }; + }; + soc { #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
1.9.1
PATCH 3/4 ARM: dts: imx27: use lable to override osc26m clock setting
In reply to Shawn GuoInstead of copying the whole node hierarchy, let's define a label for clock osc26m in soc dtsi and use it for overriding clock-frequency.
--- arch/arm/boot/dts/imx27-apf27.dts | 13 +++---------- arch/arm/boot/dts/imx27.dtsi | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-)
arch/arm/boot/dts/imx27-apf27.dts +3 -10
@@ -22,17 +22,10 @@ memory at a0000000 { reg = <0xa0000000 0x04000000>; }; +}; - clocks { - #address-cells = <1>; - #size-cells = <0>; - - osc26m { - compatible = "fsl,imx-osc26m", "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <0>; - }; - }; +&clk_osc26m { + clock-frequency = <0>; }; &iomuxc {
arch/arm/boot/dts/imx27.dtsi +1 -1
@@ -57,7 +57,7 @@ }; clocks { - osc26m { + clk_osc26m: osc26m { compatible = "fsl,imx-osc26m", "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>;
Signature · 1 line
1.9.1
Fabio Estevam
reviewerPATCH 3/4 ARM: dts: imx27: use lable to override osc26m clock setting
Hi Shawn,
Quoted 4 lines · Shawn Guo
Instead of copying the whole node hierarchy, let's define a label for clock osc26m in soc dtsi and use it for overriding clock-frequency.
Signed-off-by Shawn Guo <[email protected]>
In the Subject: s/lable/label
Other than that the series looks good.
PATCH 3/4 ARM: dts: imx27: use lable to override osc26m clock setting
Quoted 9 lines · Fabio Estevam
Hi Shawn,
Quoted 4 lines · Shawn Guo
Instead of copying the whole node hierarchy, let's define a label for clock osc26m in soc dtsi and use it for overriding clock-frequency.
Signed-off-by Shawn Guo <[email protected]>In the Subject: s/lable/label
Fixed. Thanks, Fabio.
Shawn
PATCH 4/4 ARM: dts: imx: drop 'clocks' container for board level clocks
In reply to Shawn GuoFor soc level of clocks which are input to Clock Control Module, clock driver expects them to be under 'clocks' container node. But for board level clocks, this container is not really necessary. Let's drop it and use an unique name for fixed rate clock, so that 'reg' property can be saved as well.
--- arch/arm/boot/dts/imx28-tx28.dts | 13 ++++--------- arch/arm/boot/dts/imx53-tx53.dtsi | 11 +++++------ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++--------- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 ++++------- 4 files changed, 19 insertions(+), 31 deletions(-)
arch/arm/boot/dts/imx28-tx28.dts +4 -9
@@ -140,15 +140,10 @@ regulator-boot-on; }; - clocks { - #address-cells = <1>; - #size-cells = <0>; - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; sound {
arch/arm/boot/dts/imx53-tx53.dtsi +5 -6
@@ -67,13 +67,12 @@ ckih1 { clock-frequency = <0>; }; + }; - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; gpio-keys {
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +6 -9
@@ -72,15 +72,12 @@ stdout-path = "serial0:115200n8"; }; - clocks { - /* Fixed crystal dedicated to mcp251x */ - clk16m: clk at 1 { - compatible = "fixed-clock"; - reg = <1>; - #clock-cells = <0>; - clock-frequency = <16000000>; - clock-output-names = "clk16m"; - }; + /* Fixed crystal dedicated to mcp251x */ + clk16m: clock-16m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <16000000>; + clock-output-names = "clk16m"; }; gpio-keys {
arch/arm/boot/dts/imx6q-bx50v3.dtsi +4 -7
@@ -43,13 +43,10 @@ #include "imx6q-ba16.dtsi" / { - clocks { - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <22000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <22000000>; }; gpio-poweroff {
Signature · 1 line
1.9.1
PATCH 4/4 ARM: dts: imx: drop 'clocks' container for board level clocks
Hi,
Quoted 6 lines · On Fri, 4 May 2018 08:57:26 +0800 Shawn Guo wrote:
For soc level of clocks which are input to Clock Control Module, clock driver expects them to be under 'clocks' container node. But for board level clocks, this container is not really necessary. Let's drop it and use an unique name for fixed rate clock, so that 'reg' property can be saved as well.
For imx28-tx28.dts and imx53-tx53.dtsi:
Quoted 93 lines
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/boot/dts/imx28-tx28.dts | 13 ++++--------- arch/arm/boot/dts/imx53-tx53.dtsi | 11 +++++------ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 ++++++--------- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 ++++------- 4 files changed, 19 insertions(+), 31 deletions(-)arch/arm/boot/dts/imx28-tx28.dts +4
-9@@ -140,15 +140,10 @@ regulator-boot-on; }; - clocks { - #address-cells = <1>; - #size-cells = <0>; - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; sound {arch/arm/boot/dts/imx53-tx53.dtsi +5
-6@@ -67,13 +67,12 @@ ckih1 { clock-frequency = <0>; }; + }; - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <26000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; }; gpio-keys {arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +6
-9@@ -72,15 +72,12 @@ stdout-path = "serial0:115200n8"; }; - clocks { - /* Fixed crystal dedicated to mcp251x */ - clk16m: clk at 1 { - compatible = "fixed-clock"; - reg = <1>; - #clock-cells = <0>; - clock-frequency = <16000000>; - clock-output-names = "clk16m"; - }; + /* Fixed crystal dedicated to mcp251x */ + clk16m: clock-16m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <16000000>; + clock-output-names = "clk16m"; }; gpio-keys {arch/arm/boot/dts/imx6q-bx50v3.dtsi +0
-4@@ -43,13 +43,10 @@ #include "imx6q-ba16.dtsi" / { - clocks { - mclk: clock at 0 { - compatible = "fixed-clock"; - reg = <0>;
arch/arm/boot/dts/imx6q-bx50v3.dtsi line 52
Quoted 10 lines
arch/arm/boot/dts/imx6q-bx50v3.dtsi +4
-3- #clock-cells = <0>; - clock-frequency = <22000000>; - }; + mclk: clock-mclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <22000000>; }; gpio-poweroff {
Lothar Wa?mann