From 82510358c1b61ca23678fb4f29150212738bcfdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 14 Aug 2014 15:47:13 +0200 Subject: [PATCH] ARM: dts: imx53-tx53: remove LCD regulator GPIO pinctrls from hog section --- arch/arm/boot/dts/imx53-tx53-x03x.dts | 16 ++++++++++++++++ arch/arm/boot/dts/imx53-tx53-x13x.dts | 16 ++++++++++++++++ arch/arm/boot/dts/imx53-tx53.dtsi | 4 ++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts index f95fde2ac019..f72bb563275d 100644 --- a/arch/arm/boot/dts/imx53-tx53-x03x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts @@ -178,6 +178,8 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_pwr>; enable-active-high; regulator-boot-on; }; @@ -189,6 +191,8 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_reset>; enable-active-high; regulator-boot-on; }; @@ -255,6 +259,18 @@ >; }; + pinctrl_lcd_reset: lcd-resetgrp { + fsl,pins = < + MX53_PAD_EIM_D29__GPIO3_29 0x1f0 /* LCD reset */ + >; + }; + + pinctrl_lcd_pwr: lcd-pwrgrp { + fsl,pins = < + MX53_PAD_EIM_EB3__GPIO2_31 0x1f0 /* LCD enable */ + >; + }; + pinctrl_rgb24_vga1: rgb24-vgagrp1 { fsl,pins = < MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x5 diff --git a/arch/arm/boot/dts/imx53-tx53-x13x.dts b/arch/arm/boot/dts/imx53-tx53-x13x.dts index 64804719f0f4..617d70003440 100644 --- a/arch/arm/boot/dts/imx53-tx53-x13x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x13x.dts @@ -71,6 +71,8 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lvds0_pwr>; enable-active-high; regulator-boot-on; }; @@ -82,6 +84,8 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lvds1_pwr>; enable-active-high; regulator-boot-on; }; @@ -149,6 +153,12 @@ >; }; + pinctrl_lvds0_pwr: lvds0-pwrgrp { + fsl,pins = < + MX53_PAD_EIM_D29__GPIO3_29 0x1f0 /* LCD reset */ + >; + }; + pinctrl_lvds1: lvds1grp { fsl,pins = < MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x80000000 @@ -159,6 +169,12 @@ >; }; + pinctrl_lvds1_pwr: lvds1-pwrgrp { + fsl,pins = < + MX53_PAD_EIM_EB3__GPIO2_31 0x1f0 /* LCD enable */ + >; + }; + pinctrl_pwm1: pwm1grp { fsl,pins = ; }; diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi index e348796ba689..f83a92197f26 100644 --- a/arch/arm/boot/dts/imx53-tx53.dtsi +++ b/arch/arm/boot/dts/imx53-tx53.dtsi @@ -254,8 +254,8 @@ /* Module Specific Signal */ /* MX53_PAD_NANDF_CS2__GPIO6_15 0x1f4 maybe used by EDT-FT5x06 */ /* MX53_PAD_EIM_A16__GPIO2_22 0x1f4 maybe used by EDT-FT5x06 */ - MX53_PAD_EIM_D29__GPIO3_29 0x1f4 - MX53_PAD_EIM_EB3__GPIO2_31 0x1f4 + /* MX53_PAD_EIM_D29__GPIO3_29 0x1f4 used as LCD RESET by default */ + /* MX53_PAD_EIM_EB3__GPIO2_31 0x1f4 used as LCD ENABLE by default */ /* MX53_PAD_EIM_A17__GPIO2_21 0x1f4 maybe used by EDT-FT5x06 */ /* MX53_PAD_EIM_A18__GPIO2_20 0x1f4 used by LED */ MX53_PAD_EIM_A19__GPIO2_19 0x1f4 -- 2.39.2