| Message ID | 20191008163024.17703-1-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 069de7bba5bc50f93efc78b27244a1cff696788b |
| Headers | show |
| Series | ARM: dts: imx6q-gw54xx: Do not use 'simple-audio-card, dai-link' | expand |
On Tue, Oct 08, 2019 at 01:30:24PM -0300, Fabio Estevam wrote: > 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 > > Cc: Tim Harvey <tharvey@gateworks.com> > Signed-off-by: Fabio Estevam <festevam@gmail.com> Applied, thanks.
diff --git a/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts index ecc3989f607b..d5d46908cf6e 100644 --- a/arch/arm/boot/dts/imx6q-gw54xx.dts +++ b/arch/arm/boot/dts/imx6q-gw54xx.dts @@ -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>; }; }; };
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 Cc: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> --- arch/arm/boot/dts/imx6q-gw54xx.dts | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)