rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 0cc5cb71ebe73109c6792d0356a9dbcd6f96aef0..51d39748b2a615785d29b4c6dd5770a2944ba878 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -26,6 +26,14 @@
        display-timings = <&disp_timings>;
 };
 
+&lvds {
+       status = "okay";
+
+       pinctrl-names = "lcdc", "sleep";
+       pinctrl-0 = <&lcdc0_lcdc_d>;
+       pinctrl-1 = <&lcdc0_lcdc_gpio>;
+};
+
 &lcdc {
        status = "okay";
 

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 9215d94fb36176a7a82d019eb28a79bda8445ec2..091f2e87b6c12d5c3e920bf4c9bae6c8f38f1736 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -696,9 +696,6 @@
                reg = <0x20038000 0x4000>;
                clocks = <&clk_gates5 0>;
                clock-names = "pclk_lvds";
-               pinctrl-names = "lcdc", "sleep";
-               pinctrl-0 = <&lcdc0_lcdc_d>;
-               pinctrl-1 = <&lcdc0_lcdc_gpio>;
        };
 
        lcdc: lcdc@1010e000 {