From: WeiYong Bi <bivvy.bi@rock-chips.com>
Date: Tue, 25 Apr 2017 00:42:17 +0000 (+0800)
Subject: arm64: dts: rk3368-android: remove hdmi node
X-Git-Tag: release-20171130_firefly~4^2~743
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12b4781f5b5720d5b2f2d2f46290b96d5e09729d;p=firefly-linux-kernel-4.4.55.git

arm64: dts: rk3368-android: remove hdmi node

Change-Id: I4e775f5d47c003feea730437a046761f5f4569b2
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index bd52192431c2..bc616e3e7a11 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
@@ -99,23 +99,6 @@
 		status = "okay";
 	};
 
-	hdmi: hdmi@ff980000 {
-		compatible = "rockchip,rk3368-hdmi";
-		reg = <0x0 0xff980000 0x0 0x20000>;
-		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru PCLK_HDMI_CTRL>,
-			 <&cru SCLK_HDMI_HDCP>,
-			 <&cru SCLK_HDMI_CEC>;
-		clock-names = "pclk_hdmi", "hdcp_clk_hdmi", "cec_clk_hdmi";
-		power-domains = <&power RK3368_PD_VIO>;
-		resets = <&cru SRST_HDMI>;
-		reset-names = "hdmi";
-		pinctrl-names = "default", "gpio";
-		pinctrl-0 = <&hdmii2c_xfer &hdmi_cec>;
-		pinctrl-1 = <&i2c5_gpio>;
-		status = "disabled";
-	};
-
 	dwc_control_usb: dwc-control-usb {
 		compatible = "rockchip,rk3368-dwc-control-usb";
 		status = "okay";
@@ -159,7 +142,7 @@
 	memory-region = <&drm_logo>;
 	route {
 		route_mipi: route-mipi {
-			status = "okay";
+			status = "disabled";
 			logo,uboot = "logo.bmp";
 			logo,kernel = "logo_kernel.bmp";
 			logo,mode = "center";
@@ -239,26 +222,6 @@
 };
 
 &pinctrl {
-	hdmi_i2c {
-		hdmii2c_xfer: hdmii2c-xfer {
-			rockchip,pins = <3 26 RK_FUNC_1 &pcfg_pull_none>,
-					<3 27 RK_FUNC_1 &pcfg_pull_none>;
-		};
-	};
-
-	hdmi_pin {
-		hdmi_cec: hdmi-cec {
-			rockchip,pins =	<3 23 RK_FUNC_1 &pcfg_pull_none>;
-		};
-	};
-
-	i2c5 {
-		i2c5_gpio: i2c5-gpio {
-			rockchip,pins = <3 26 RK_FUNC_GPIO &pcfg_pull_none>,
-					<3 27 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
 	isp {
 		cif_clkout: cif-clkout {
 			rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout