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:
7fbaddc
)
rk312x dts: fix fpga dts compile err
author
zwl
<zwl@rockchips.com>
Tue, 29 Jul 2014 09:40:34 +0000
(17:40 +0800)
committer
zwl
<zwl@rockchips.com>
Tue, 29 Jul 2014 09:40:49 +0000
(17:40 +0800)
arch/arm/boot/dts/rk3126-fpga.dts
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/rk3126-fpga.dts
b/arch/arm/boot/dts/rk3126-fpga.dts
index 01e7dc1eec0fae32c46a28b4e4e49ad2003f6f11..eb32e62c37f0f55f94196bef11b2cee4052ac9a4 100755
(executable)
--- a/
arch/arm/boot/dts/rk3126-fpga.dts
+++ b/
arch/arm/boot/dts/rk3126-fpga.dts
@@
-1,7
+1,7
@@
/dts-v1/;
#include "rk312x.dtsi"
#include "rk312x-pinctrl.dtsi"
-
+#include "lcd-b101ew05.dtsi"
/ {
compatible = "rockchip,rk3126";
@@
-19,16
+19,16
@@
status = "okay";
};
- &fb {
- rockchip,disp-mode = <ONE_DUAL>;
- };
+};
-
&rk_screen
{
-
display-timings = <&disp_timings
>;
-
};
+
&fb
{
+
rockchip,disp-mode = <ONE_DUAL
>;
+};
-
&lcdc
{
-
status = "okay"
;
-
};
+
&rk_screen
{
+
display-timings = <&disp_timings>
;
+};
+&lcdc {
+ status = "okay";
};