[RESEND] arm64: dts: meson-axg: fix dtc warning about unit address

Message ID 20181108095156.26810-1-jbrunet@baylibre.com
State New
Headers show
Series
  • [RESEND] arm64: dts: meson-axg: fix dtc warning about unit address
Related show

Commit Message

Jerome Brunet Nov. 8, 2018, 9:51 a.m.
section 2.2.1 of the DT specs says: " If the node has no reg property,
the @unit-address must be omitted and the node-name alone differentiates
the node from other nodes at the same level in the tree"

Simply replace the '@' with a '-' to fix this warning.

Cc: Fabio Estevam <festevam@gmail.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

---

Hi Kevin,

I'm resending this change because I noticed the previous patch I sent had
references to spdif input which has not been merged yet. This would have
triggered a conflict in your tree.

Hopefully, this new version will apply correctly

Cheers
Jerome

 .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 26 +++++++++----------
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi    |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

-- 
2.19.1

Comments

Neil Armstrong Nov. 8, 2018, 1:28 p.m. | #1
On 08/11/2018 10:51, Jerome Brunet wrote:
> section 2.2.1 of the DT specs says: " If the node has no reg property,

> the @unit-address must be omitted and the node-name alone differentiates

> the node from other nodes at the same level in the tree"

> 

> Simply replace the '@' with a '-' to fix this warning.

> 

> Cc: Fabio Estevam <festevam@gmail.com>

> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

> ---

> 

> Hi Kevin,

> 

> I'm resending this change because I noticed the previous patch I sent had

> references to spdif input which has not been merged yet. This would have

> triggered a conflict in your tree.

> 

> Hopefully, this new version will apply correctly

> 

> Cheers

> Jerome

> 

>  .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 26 +++++++++----------

>  arch/arm64/boot/dts/amlogic/meson-axg.dtsi    |  6 ++---

>  2 files changed, 16 insertions(+), 16 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

> index 18778ada7bd3..ba44b0419404 100644

> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

> @@ -60,7 +60,7 @@

>  		serial1 = &uart_A;

>  	};

>  


[...]

>  

> -	tdmif_c: audio-controller@2 {

> +	tdmif_c: audio-controller-2 {

>  		compatible = "amlogic,axg-tdm-iface";

>  		#sound-dai-cells = <0>;

>  		sound-name-prefix = "TDM_C";

> 


Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Kevin Hilman Nov. 15, 2018, 7:49 p.m. | #2
Jerome Brunet <jbrunet@baylibre.com> writes:

> section 2.2.1 of the DT specs says: " If the node has no reg property,

> the @unit-address must be omitted and the node-name alone differentiates

> the node from other nodes at the same level in the tree"

>

> Simply replace the '@' with a '-' to fix this warning.

>

> Cc: Fabio Estevam <festevam@gmail.com>

> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

> ---

>

> Hi Kevin,

>

> I'm resending this change because I noticed the previous patch I sent had

> references to spdif input which has not been merged yet. This would have

> triggered a conflict in your tree.

>

> Hopefully, this new version will apply correctly


Thanks for the resend, this version applies (and builds) cleanly.

Queued for v4.21 with Neil's tag (branch: v4.21/dt64)

Kevin

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 18778ada7bd3..ba44b0419404 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -60,7 +60,7 @@ 
 		serial1 = &uart_A;
 	};
 
-	linein: audio-codec@0 {
+	linein: audio-codec-0 {
 		#sound-dai-cells = <0>;
 		compatible = "everest,es7241";
 		VDDA-supply = <&vcc_3v3>;
@@ -70,7 +70,7 @@ 
 		sound-name-prefix = "Linein";
 	};
 
-	lineout: audio-codec@1 {
+	lineout: audio-codec-1 {
 		#sound-dai-cells = <0>;
 		compatible = "everest,es7154";
 		VDD-supply = <&vcc_3v3>;
@@ -79,14 +79,14 @@ 
 		sound-name-prefix = "Lineout";
 	};
 
-	spdif_dit: audio-codec@2 {
+	spdif_dit: audio-codec-2 {
 		#sound-dai-cells = <0>;
 		compatible = "linux,spdif-dit";
 		status = "okay";
 		sound-name-prefix = "DIT";
 	};
 
-	dmics: audio-codec@3 {
+	dmics: audio-codec-3 {
 		#sound-dai-cells = <0>;
 		compatible = "dmic-codec";
 		num-channels = <7>;
@@ -272,31 +272,31 @@ 
 				       <393216000>;
 		status = "okay";
 
-		dai-link@0 {
+		dai-link-0 {
 			sound-dai = <&frddr_a>;
 		};
 
-		dai-link@1 {
+		dai-link-1 {
 			sound-dai = <&frddr_b>;
 		};
 
-		dai-link@2 {
+		dai-link-2 {
 			sound-dai = <&frddr_c>;
 		};
 
-		dai-link@3 {
+		dai-link-3 {
 			sound-dai = <&toddr_a>;
 		};
 
-		dai-link@4 {
+		dai-link-4 {
 			sound-dai = <&toddr_b>;
 		};
 
-		dai-link@5 {
+		dai-link-5 {
 			sound-dai = <&toddr_c>;
 		};
 
-		dai-link@6 {
+		dai-link-6 {
 			sound-dai = <&tdmif_c>;
 			dai-format = "i2s";
 			dai-tdm-slot-tx-mask-2 = <1 1>;
@@ -317,7 +317,7 @@ 
 
 		};
 
-		dai-link@7 {
+		dai-link-7 {
 			sound-dai = <&spdifout>;
 
 			codec {
@@ -325,7 +325,7 @@ 
 			};
 		};
 
-		dai-link@8 {
+		dai-link-8 {
 			sound-dai = <&pdm>;
 
 			codec {
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index df017dbd2e57..eb46db001ce0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -20,7 +20,7 @@ 
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	tdmif_a: audio-controller@0 {
+	tdmif_a: audio-controller-0 {
 		compatible = "amlogic,axg-tdm-iface";
 		#sound-dai-cells = <0>;
 		sound-name-prefix = "TDM_A";
@@ -31,7 +31,7 @@ 
 		status = "disabled";
 	};
 
-	tdmif_b: audio-controller@1 {
+	tdmif_b: audio-controller-1 {
 		compatible = "amlogic,axg-tdm-iface";
 		#sound-dai-cells = <0>;
 		sound-name-prefix = "TDM_B";
@@ -42,7 +42,7 @@ 
 		status = "disabled";
 	};
 
-	tdmif_c: audio-controller@2 {
+	tdmif_c: audio-controller-2 {
 		compatible = "amlogic,axg-tdm-iface";
 		#sound-dai-cells = <0>;
 		sound-name-prefix = "TDM_C";