Skip to contentSkip to conversation

ARM: dts: imx6q-gw54xx: Do not use 'simple-audio-card, dai-link'

PATCH Applied Fabio Estevam 2 participants 2 messages Oct 8, 2019 – Oct 25, 2019

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 ARM: dts: imx6q-gw54xx: Do not use 'simple-audio-card, dai-link'

According to Documentation/devicetree/bindings/sound/simple-card.txt the 'simple-audio-card,dai-link' may be omitted when the card has only one DAI link, which is the case here.

Get rid of 'simple-audio-card,dai-link' in order to fix the following build warning with W=1:

arch/arm/boot/dts/imx6q-gw54xx.dts:19.32-31.5: Warning (unit_address_vs_reg): /sound-digital/simple-audio-card,dai-link@0: node has a unit name, but no reg property

---
 arch/arm/boot/dts/imx6q-gw54xx.dts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
arch/arm/boot/dts/imx6q-gw54xx.dts +8 -11
index ecc3989f607b..d5d46908cf6e 100644
@@ -15,19 +15,16 @@
 	sound-digital {
 		compatible = "simple-audio-card";
 		simple-audio-card,name = "tda1997x-audio";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&sound_codec>;
+		simple-audio-card,frame-master = <&sound_codec>;
 
-		simple-audio-card,dai-link@0 {
-			format = "i2s";
-
-			cpu {
-				sound-dai = <&ssi2>;
-			};
+		sound_cpu: simple-audio-card,cpu {
+			sound-dai = <&ssi2>;
+		};
 
-			codec {
-				bitclock-master;
-				frame-master;
-				sound-dai = <&hdmi_receiver>;
-			};
+		sound_codec: simple-audio-card,codec {
+			sound-dai = <&hdmi_receiver>;
 		};
 	};
 };
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#1 lore raw

Re: [PATCH] ARM: dts: imx6q-gw54xx: Do not use 'simple-audio-card,dai-link'

Quoted 11 lines · Fabio Estevam

According to Documentation/devicetree/bindings/sound/simple-card.txt the 'simple-audio-card,dai-link' may be omitted when the card has only one DAI link, which is the case here.

Get rid of 'simple-audio-card,dai-link' in order to fix the following build warning with W=1:

arch/arm/boot/dts/imx6q-gw54xx.dts:19.32-31.5: Warning (unit_address_vs_reg): /sound-digital/simple-audio-card,dai-link@0: node has a unit name, but no reg property

Applied, thanks.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel