summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianhui Wang <wjh@rock-chips.com>2019-01-24 16:02:31 +0800
committerTao Huang <huangtao@rock-chips.com>2019-01-25 15:35:13 +0800
commit27f039b43ada8d0301867505ce9a91d8b5c604bc (patch)
tree029f02d4ac3de5837e18aef47bc21012878a2415
parent8ea4ee1c3e33cb36808c41af5867b8d8ec69d330 (diff)
arm64: dts: rockchip: rk3399-sapphire-excavator-edp: modify sound adapter
HDMI sound use i2s2 & dp sound use spdif Change-Id: Id4ee15d3eb67dad1372f733ecf16182cc6488835 Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts12
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi7
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
index 725e39f10556..417746709537 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
@@ -69,6 +69,18 @@
};
};
+&dp_sound {
+ status = "disabled";
+};
+
+&hdmi_dp_sound {
+ status = "disabled";
+};
+
+&hdmi_sound {
+ status = "okay";
+};
+
&isp0 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 5728818893c2..9d8297c5cc41 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -100,6 +100,13 @@
#sound-dai-cells = <0>;
};
+ dp_sound: dp-sound {
+ status = "disabled";
+ compatible = "rockchip,cdndp-sound";
+ rockchip,cpu = <&spdif>;
+ rockchip,codec = <&cdn_dp 1>;
+ };
+
hdmi_sound: hdmi-sound {
status = "disabled";
compatible = "simple-audio-card";