diff options
author | Christophe Priouzeau <christophe.priouzeau@st.com> | 2018-09-03 11:49:25 -0400 |
---|---|---|
committer | Patrice Chotard <patrice.chotard@st.com> | 2018-09-25 11:41:51 -0400 |
commit | b5b4c8dd5c44edc112a362f87a8d8953336571bd (patch) | |
tree | 3d62fd2d19a8c0c1fffd18c9ba46ae9e1fa3d55f | |
parent | 5b394b2ddf0347bef56e50c69a58773c94343ff3 (diff) |
ARM: dts: stih410: change syntax of multiple DAI
With change of syntax for 'simple-audio-card,dai-link' containers,
devicetrees of stih410 must be updated.
This fixes the following error:
[ 3.839466] asoc-simple-card sound: asoc_simple_card_dai_link_of:
Can't find simple-audio-card,cpu DT node
[ 3.849150] asoc-simple-card sound: parse error -22
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
-rw-r--r-- | arch/arm/boot/dts/stih410-b2260.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/stihxxx-b2120.dtsi | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 155caa8c002a..4ee6d51d8d1e 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts | |||
@@ -61,8 +61,11 @@ | |||
61 | compatible = "simple-audio-card"; | 61 | compatible = "simple-audio-card"; |
62 | simple-audio-card,name = "STI-B2260"; | 62 | simple-audio-card,name = "STI-B2260"; |
63 | status = "okay"; | 63 | status = "okay"; |
64 | #address-cells = <1>; | ||
65 | #size-cells = <0>; | ||
64 | 66 | ||
65 | simple-audio-card,dai-link0 { | 67 | simple-audio-card,dai-link@0 { |
68 | reg = <0>; | ||
66 | /* DAC */ | 69 | /* DAC */ |
67 | format = "i2s"; | 70 | format = "i2s"; |
68 | mclk-fs = <128>; | 71 | mclk-fs = <128>; |
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index 4dedfcb0fcb3..97e05f55fb6e 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi | |||
@@ -27,8 +27,11 @@ | |||
27 | compatible = "simple-audio-card"; | 27 | compatible = "simple-audio-card"; |
28 | simple-audio-card,name = "STI-B2120"; | 28 | simple-audio-card,name = "STI-B2120"; |
29 | status = "okay"; | 29 | status = "okay"; |
30 | #address-cells = <1>; | ||
31 | #size-cells = <0>; | ||
30 | 32 | ||
31 | simple-audio-card,dai-link0 { | 33 | simple-audio-card,dai-link@0 { |
34 | reg = <0>; | ||
32 | /* HDMI */ | 35 | /* HDMI */ |
33 | format = "i2s"; | 36 | format = "i2s"; |
34 | mclk-fs = <128>; | 37 | mclk-fs = <128>; |
@@ -41,7 +44,8 @@ | |||
41 | }; | 44 | }; |
42 | }; | 45 | }; |
43 | 46 | ||
44 | simple-audio-card,dai-link1 { | 47 | simple-audio-card,dai-link@1 { |
48 | reg = <1>; | ||
45 | /* DAC */ | 49 | /* DAC */ |
46 | format = "i2s"; | 50 | format = "i2s"; |
47 | mclk-fs = <256>; | 51 | mclk-fs = <256>; |
@@ -55,7 +59,8 @@ | |||
55 | }; | 59 | }; |
56 | }; | 60 | }; |
57 | 61 | ||
58 | simple-audio-card,dai-link2 { | 62 | simple-audio-card,dai-link@2 { |
63 | reg = <2>; | ||
59 | /* SPDIF */ | 64 | /* SPDIF */ |
60 | format = "left_j"; | 65 | format = "left_j"; |
61 | mclk-fs = <128>; | 66 | mclk-fs = <128>; |