Skip to content

Commit 04e0877

Browse files
committed
ARM: dts: samsung: s5pv210-fascinate4g: 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 c670e7c commit 04e0877

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,30 +74,29 @@
7474
headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_HIGH>;
7575
headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>;
7676

77-
samsung,audio-routing =
78-
"HP", "HPOUT1L",
79-
"HP", "HPOUT1R",
77+
audio-routing = "HP", "HPOUT1L",
78+
"HP", "HPOUT1R",
8079

81-
"SPK", "SPKOUTLN",
82-
"SPK", "SPKOUTLP",
80+
"SPK", "SPKOUTLN",
81+
"SPK", "SPKOUTLP",
8382

84-
"RCV", "HPOUT2N",
85-
"RCV", "HPOUT2P",
83+
"RCV", "HPOUT2N",
84+
"RCV", "HPOUT2P",
8685

87-
"LINE", "LINEOUT2N",
88-
"LINE", "LINEOUT2P",
86+
"LINE", "LINEOUT2N",
87+
"LINE", "LINEOUT2P",
8988

90-
"IN1LP", "Main Mic",
91-
"IN1LN", "Main Mic",
89+
"IN1LP", "Main Mic",
90+
"IN1LN", "Main Mic",
9291

93-
"IN1RP", "Headset Mic",
94-
"IN1RN", "Headset Mic",
92+
"IN1RP", "Headset Mic",
93+
"IN1RN", "Headset Mic",
9594

96-
"Modem Out", "Modem TX",
97-
"Modem RX", "Modem In",
95+
"Modem Out", "Modem TX",
96+
"Modem RX", "Modem In",
9897

99-
"Bluetooth SPK", "TX",
100-
"RX", "Bluetooth Mic";
98+
"Bluetooth SPK", "TX",
99+
"RX", "Bluetooth Mic";
101100

102101
pinctrl-names = "default";
103102
pinctrl-0 = <&headset_det &earpath_sel>;

0 commit comments

Comments
 (0)