From a274596ac370dab19c3558a1208edff055b8571d Mon Sep 17 00:00:00 2001
From: Zorro Liu <lyx@rock-chips.com>
Date: Fri, 17 Mar 2017 16:11:56 +0800
Subject: [PATCH] arm64: dts: rk3368: hdmi disabled default and remove hdmi
node from p9 board
Change-Id: I034f119de02a04841b8b70746ef63c73a170988f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
---
.../boot/dts/rockchip/rk3368-android.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3368-p9.dts | 19 -------------------
arch/arm64/boot/dts/rockchip/rk3368-sheep.dts | 4 ++++
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index b60df08aba50..9b6e815c6c84 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
@@ -160,7 +160,7 @@
pinctrl-names = "default", "gpio";
pinctrl-0 = <&hdmii2c_xfer &hdmi_cec>;
pinctrl-1 = <&i2c5_gpio>;
- status = "okay";
+ status = "disabled";
};
dwc_control_usb: dwc-control-usb {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
index 855a579c870c..4928e62916f1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
@@ -70,21 +70,6 @@
};
};
- hdmi_sound: hdmi-sound {
- status = "okay";
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,mclk-fs = <256>;
- simple-audio-card,name = "rockchip,hdmi";
-
- simple-audio-card,cpu {
- sound-dai = <&i2s_8ch>;
- };
- simple-audio-card,codec {
- sound-dai = <&hdmi>;
- };
- };
-
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk818 1>;
@@ -218,10 +203,6 @@
};
};
-&hdmi {
- status = "okay";
-};
-
&cpu_l0 {
cpu-supply = <&syr827>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
index c9f739178341..41fe21b6a42c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
@@ -587,6 +587,10 @@
status = "okay";
};
+&hdmi {
+ status = "okay";
+};
+
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
--
2.34.1