Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Fabio Estevam and committed by
Shawn Guo
069de7bb 764b5b5e

+8 -11
+8 -11
arch/arm/boot/dts/imx6q-gw54xx.dts
··· 15 15 sound-digital { 16 16 compatible = "simple-audio-card"; 17 17 simple-audio-card,name = "tda1997x-audio"; 18 + simple-audio-card,format = "i2s"; 19 + simple-audio-card,bitclock-master = <&sound_codec>; 20 + simple-audio-card,frame-master = <&sound_codec>; 18 21 19 - simple-audio-card,dai-link@0 { 20 - format = "i2s"; 22 + sound_cpu: simple-audio-card,cpu { 23 + sound-dai = <&ssi2>; 24 + }; 21 25 22 - cpu { 23 - sound-dai = <&ssi2>; 24 - }; 25 - 26 - codec { 27 - bitclock-master; 28 - frame-master; 29 - sound-dai = <&hdmi_receiver>; 30 - }; 26 + sound_codec: simple-audio-card,codec { 27 + sound-dai = <&hdmi_receiver>; 31 28 }; 32 29 }; 33 30 };