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>

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index b60df08aba508321c298392eab13b105fb363803..9b6e815c6c84e1d07ff26fa70db91f917ffef821 100644 (file)
--- 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 855a579c870c374af05384484d952905580b7de6..4928e62916f109b9186e694d2b882f4db887dbb1 100644 (file)
--- 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 c9f7391783411ca63ea537b43a8fd410bf62e09d..41fe21b6a42c88e29f6e8ee12316b85ae678df83 100644 (file)
--- 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 {