From 6fa15cd64ec5573d1145649797d16b50f6655b26 Mon Sep 17 00:00:00 2001 From: zwl Date: Tue, 12 Aug 2014 23:22:17 +0800 Subject: [PATCH] rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need --- arch/arm/boot/dts/rk3128-sdk.dts | 8 ++++++++ arch/arm/boot/dts/rk312x.dtsi | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts index 0cc5cb71ebe7..51d39748b2a6 100755 --- 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 9215d94fb361..091f2e87b6c1 100755 --- 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 { -- 2.34.1