From: zyc <zyc@rock-chips.com>
Date: Fri, 8 Aug 2014 08:59:51 +0000 (+0800)
Subject: rk312x: mistaken commit of  rk312x-sdk.dtsi file in commit 45023a37a5cb1955210838ee54... 
X-Git-Tag: firefly_0821_release~4916^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6713e83c8a6ec803e05860d8ed08ca7c87cca1f;p=firefly-linux-kernel-4.4.55.git

rk312x: mistaken commit of  rk312x-sdk.dtsi file in commit 45023a37a5cb1955210838ee543f5b54ae1c522c,fix it
---

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index ed8a095e3bb8..1390dd2af07f 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -2,7 +2,6 @@
 
 #include "rk312x.dtsi"
 
-#include "lcd-b101ew05.dtsi"
 #include "rk312x-cif-sensor.dtsi"
 / {
 	fiq-debugger {
@@ -208,7 +207,7 @@
 &rk818 {
 	gpios =<&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>,<&gpio1 GPIO_A1 GPIO_ACTIVE_LOW>;
 	rk818,system-power-controller;
-	//rk818,support_dc_chg = <1>;/*1: dc chg; 0:usb chg*/
+	rk818,support_dc_chg = <1>;/*1: dc chg; 0:usb chg*/
 
 	regulators {