ARM: dts: rockchip: fix rk3288 dts files

Change-Id: I7d4233dee5ee81166e666f1663793b09e15f5970
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>

arch/arm/boot/dts/Makefile

@@ -863,6 +863,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3229-gva-sdk.dtb \
 	rk3288-evb-act8846.dtb \
 	rk3288-evb-rk808.dtb \
+	rk3288-evb-android-rk808-edp-avb.dtb \
 	rk3288-fennec.dtb \
 	rk3288-firefly-beta.dtb \
 	rk3288-firefly.dtb \

arch/arm/boot/dts/rk3288-android.dtsi

@@ -46,10 +46,6 @@
 #include <dt-bindings/display/media-bus-format.h>
 
 / {
-	firmware {
-		firmware_android: android {};
-	};
-
 	chosen: chosen {
 		bootargs = "earlycon=uart8250,mmio32,0xff690000 vmalloc=496M";
 	};
@@ -320,7 +316,8 @@
 				"rockchip,rk3368-hdmi-analog";
 		rockchip,model = "rockchip,rt5640-codec";
 		rockchip,cpu = <&i2s>;
-		rockchip,codec = <&rt5640>, <&hdmi>;
+		//rockchip,codec = <&rt5640>, <&hdmi>;
+		rockchip,codec = <&hdmi>;
 		rockchip,widgets =
 			"Microphone", "Microphone Jack",
 			"Headphone", "Headphone Jack";
@@ -385,8 +382,8 @@
 	dma-coherent;
 };
 
-&video_phy {
-	status = "okay";
+&uart2 {
+	status = "disabled";
 };
 
 &pinctrl {

arch/arm/boot/dts/rk3288-evb-android-rk808-edp-avb.dts

@@ -15,25 +15,6 @@
 	};
 };
 
-&firmware_android {
-	compatible = "android,firmware";
-	boot_devices = "ff0f0000.dwmmc";
-	vbmeta {
-		compatible = "android,vbmeta";
-		parts = "vbmeta,boot,system,vendor,dtbo";
-	};
-	fstab {
-		compatible = "android,fstab";
-		vendor {
-			compatible = "android,vendor";
-			dev = "/dev/block/by-name/vendor";
-			type = "ext4";
-			mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-			fsmgr_flags = "wait,avb";
-		};
-	};
-};
-
 &vopb {
 	assigned-clocks = <&cru DCLK_VOP0>;
 	assigned-clock-parents = <&cru PLL_GPLL>;

arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi

@@ -73,7 +73,7 @@
 	status = "okay";
 };
 
-&edp_panel {
+&panel {
 	compatible = "simple-panel";
 	backlight = <&backlight>;
 	enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
@@ -371,10 +371,6 @@
 	wifi-supply = <&vcc_wl>;
 };
 
-&lvds_panel {
-	power-supply = <&vcc_lcd>;
-};
-
 &rockchip_suspend {
 	status = "okay";
 	rockchip,pwm-regulator-config = <

arch/arm/boot/dts/rk3288-evb.dtsi

@@ -336,6 +336,12 @@
 		};
 	};
 
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	sdmmc {
 		/*
 		 * Default drive strength isn't enough to achieve even

arch/arm/boot/dts/rk3288-firefly-reload.dts

@@ -192,7 +192,10 @@
 &hdmi {
 	ddc-i2c-bus = <&i2c5>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&hdmi_cec_c0>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&hdmi_ddc>;
+	pinctrl-1 = <&hdmi_gpio>;
+
 	status = "okay";
 };
 

arch/arm/boot/dts/rk3288-linux.dtsi

@@ -86,7 +86,7 @@
 
 	fiq-debugger {
 		compatible = "rockchip,fiq-debugger";
-		interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 		rockchip,serial-id = <2>;
 		rockchip,wake-irq = <0>;
 		/* If enable uart uses irq instead of fiq */
@@ -181,6 +181,10 @@
 	compatible = "rockchip,rk3288-secure-efuse";
 };
 
+&uart2 {
+	status = "disabled";
+};
+
 &video_phy {
 	status = "okay";
 };