projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
abbe0a2
)
rk312x: mistaken commit of rk312x-sdk.dtsi file in commit 45023a37a5cb1955210838ee54...
author
zyc
<zyc@rock-chips.com>
Fri, 8 Aug 2014 08:59:51 +0000
(16:59 +0800)
committer
zyc
<zyc@rock-chips.com>
Fri, 8 Aug 2014 08:59:51 +0000
(16:59 +0800)
arch/arm/boot/dts/rk312x-sdk.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/rk312x-sdk.dtsi
b/arch/arm/boot/dts/rk312x-sdk.dtsi
index ed8a095e3bb892eb7378118ef4d90f3930f23c29..1390dd2af07fdac2efc354f8a6703e35eb52d6dd 100755
(executable)
--- 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 {