Skip to content

Commit 8edc16a

Browse files
committed
ARM: dts: samsung: s5pv210-galaxys: switch sound card to audio-routing
"samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 04e0877 commit 8edc16a

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

arch/arm/boot/dts/samsung/s5pv210-galaxys.dts

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,33 +101,32 @@
101101
headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_LOW>;
102102
headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>;
103103

104-
samsung,audio-routing =
105-
"HP", "HPOUT1L",
106-
"HP", "HPOUT1R",
104+
audio-routing = "HP", "HPOUT1L",
105+
"HP", "HPOUT1R",
107106

108-
"SPK", "SPKOUTLN",
109-
"SPK", "SPKOUTLP",
107+
"SPK", "SPKOUTLN",
108+
"SPK", "SPKOUTLP",
110109

111-
"RCV", "HPOUT2N",
112-
"RCV", "HPOUT2P",
110+
"RCV", "HPOUT2N",
111+
"RCV", "HPOUT2P",
113112

114-
"LINE", "LINEOUT2N",
115-
"LINE", "LINEOUT2P",
113+
"LINE", "LINEOUT2N",
114+
"LINE", "LINEOUT2P",
116115

117-
"IN1LP", "Main Mic",
118-
"IN1LN", "Main Mic",
116+
"IN1LP", "Main Mic",
117+
"IN1LN", "Main Mic",
119118

120-
"IN1RP", "Headset Mic",
121-
"IN1RN", "Headset Mic",
119+
"IN1RP", "Headset Mic",
120+
"IN1RN", "Headset Mic",
122121

123-
"IN2LN", "FM In",
124-
"IN2RN", "FM In",
122+
"IN2LN", "FM In",
123+
"IN2RN", "FM In",
125124

126-
"Modem Out", "Modem TX",
127-
"Modem RX", "Modem In",
125+
"Modem Out", "Modem TX",
126+
"Modem RX", "Modem In",
128127

129-
"Bluetooth SPK", "TX",
130-
"RX", "Bluetooth Mic";
128+
"Bluetooth SPK", "TX",
129+
"RX", "Bluetooth Mic";
131130

132131
pinctrl-names = "default";
133132
pinctrl-0 = <&headset_det &earpath_sel>;

0 commit comments

Comments
 (0)