From: zwl Date: Tue, 29 Jul 2014 09:40:34 +0000 (+0800) Subject: rk312x dts: fix fpga dts compile err X-Git-Tag: firefly_0821_release~4916^2~127 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a27fe242495f331c893f3a11b3c4a6d941bb271;p=firefly-linux-kernel-4.4.55.git rk312x dts: fix fpga dts compile err --- diff --git a/arch/arm/boot/dts/rk3126-fpga.dts b/arch/arm/boot/dts/rk3126-fpga.dts index 01e7dc1eec0f..eb32e62c37f0 100755 --- 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 = ; - }; +}; - &rk_screen { - display-timings = <&disp_timings>; - }; +&fb { + rockchip,disp-mode = ; +}; - &lcdc { - status = "okay"; - }; +&rk_screen { + display-timings = <&disp_timings>; +}; +&lcdc { + status = "okay"; };