Skip to content

Commit 03275d4

Browse files
committed
ODROID-GO3: arm64: dts: rockchip: use multicodecs driver
1 parent 7bb9128 commit 03275d4

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

arch/arm64/boot/dts/rockchip/rk3326-odroidgo3-linux.dts

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -284,26 +284,15 @@
284284
};
285285

286286
rk817-sound {
287-
compatible = "simple-audio-card";
288-
simple-audio-card,format = "i2s";
289-
simple-audio-card,name = "rockchip,rk817-codec";
290-
simple-audio-card,mclk-fs = <256>;
291-
simple-audio-card,widgets =
292-
"Microphone", "Mic Jack",
293-
"Headphone", "Headphone Jack";
294-
simple-audio-card,routing =
295-
"MIC_IN", "Mic Jack",
296-
/*"IN1P", "Mic Jack",*/
297-
"Headphone Jack", "HPOL",
298-
"Headphone Jack", "HPOR";
299-
simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
300-
simple-audio-card,codec-hp-det = <1>;
301-
simple-audio-card,cpu {
302-
sound-dai = <&i2s1_2ch>;
303-
};
304-
simple-audio-card,codec {
305-
sound-dai = <&rk817_codec>;
306-
};
287+
compatible = "rockchip,multicodecs-card";
288+
rockchip,card-name = "rockchip-rk817";
289+
hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
290+
rockchip,format = "i2s";
291+
rockchip,mclk-fs = <256>;
292+
rockchip,cpu = <&i2s1_2ch>;
293+
rockchip,codec = <&rk817_codec>;
294+
pinctrl-names = "default";
295+
pinctrl-0 = <&hp_det>;
307296
};
308297

309298
vccsys: vccsys {
@@ -1037,6 +1026,13 @@
10371026
};
10381027

10391028
&pinctrl {
1029+
headphone {
1030+
//High : HeadPhone remove, Low : HeadPhone insert
1031+
hp_det: hp-det {
1032+
rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
1033+
};
1034+
};
1035+
10401036
pmic {
10411037
/* ODROID-GO2 : PMIC_INT(GPIO0.PB2) */
10421038
pmic_int: pmic_int {

0 commit comments

Comments
 (0)