--- a/rk3576_an14/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-isolution-interactive-tablet.dtsi
+++ b/rk3576_an14/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576-isolution-interactive-tablet.dtsi
@@ -13,14 +13,13 @@
/ {
es8388_sound: es8388-sound {
- status = "okay";
+ status = "disabled";
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip-es8388";
rockchip,format = "i2s";
rockchip,mclk-fs = <256>;
rockchip,cpu = <&sai1>;
- rockchip,codec = <&es8388>,<&ap8232c2_codec>,<&ad82584f_stereo>,<&ad82584f_mono>;
-/*
+ rockchip,codec = <&es8388>,<&ad82584f_stereo>,<&ad82584f_mono>;
rockchip,audio-routing =
"Headphone", "LOUT1",
"Headphone", "ROUT1",
@@ -34,21 +33,40 @@
"LINPUT2", "Main Mic",
"RINPUT1", "Headset Mic",
"RINPUT2", "Headset Mic";
-*/
pinctrl-names = "default";
};
+ ap8232c2_sound: ap8232c2-sound {
+ status = "okay";
+ compatible = "rockchip,multicodecs-card";
+ rockchip,card-name = "rockchip-ap8232c2";
+ rockchip,format = "i2s";
+ rockchip,mclk-fs = <256>;
+ rockchip,cpu = <&pdm_i2s_dais>;
+ rockchip,codec = <&ap8232c2_codec>,<&ad82584f_stereo>,<&ad82584f_mono>;
+ };
+
+ pdm_i2s_dais: pdm-i2s-dais {
+ status = "okay";
+ compatible = "rockchip,rk3588-multi-dais", "rockchip,multi-dais";
+ dais = <&pdm1>,<&sai1>;
+ capture,channel-mapping = <8 2>;
+ playback,channel-mapping = <0 2>;
+ #sound-dai-cells = <0>;
+ };
+
+
ap8232c2_codec: ap8232c2-codec {
- status = "okay";
- clocks = <&mclkout_sai1>;
- clock-names = "mclk";
- pinctrl-names = "default";
- pinctrl-0 = <&sai1m1_mclk>;
- assigned-clocks = <&mclkout_sai1>;
- assigned-clock-rates = <12288000>;
- compatible = "rockchip,dummy-codec";
- #sound-dai-cells = <0>;
-};
+ status = "okay";
+ clocks = <&mclkout_sai1>;
+ clock-names = "mclk";
+ pinctrl-names = "default";
+ pinctrl-0 = <&sai1m1_mclk>;
+ assigned-clocks = <&mclkout_sai1>;
+ assigned-clock-rates = <12288000>;
+ compatible = "rockchip,dummy-codec";
+ #sound-dai-cells = <0>;
+ };
rk628_dc: rk628-dc {
compatible = "rockchip,dummy-codec";
@@ -92,7 +110,7 @@
spdif-tx0-sound {
status = "okay";
compatible = "simple-audio-card";
- simple-audio-card,name = "rockchiphdmiarc";
+ simple-audio-card,name = "rockchip,hdmiarc";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,cpu {
sound-dai = <&spdif_tx0>;
@@ -229,8 +247,28 @@
/*add by rongyf : Backlight reversed*/
backlight: backlight {
- pwms = <&pwm1_6ch_1 0 25000 1>;