From 45416894fb522634af1de64a28a2a10a2729d694 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Tue, 10 Nov 2015 19:57:55 +0100 Subject: [PATCH] ARM: dts: tx6ul: configure LCD_RESET as GPIO --- arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 30 ++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi index 505f5d67774c..53a12adfa04c 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi @@ -156,16 +156,30 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcd1_pwr>; + pinctrl-0 = <&pinctrl_lcd_pwr>; gpio = <&gpio5 4 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; regulator-always-on; }; - reg_usbh1_vbus: regulator@6 { + reg_lcd_reset: regulator@6 { compatible = "regulator-fixed"; reg = <6>; + regulator-name = "LCD RESET"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_reset>; + gpio = <&gpio3 4 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + regulator-always-on; + }; + + reg_usbh1_vbus: regulator@7 { + compatible = "regulator-fixed"; + reg = <7>; regulator-name = "usbh1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -175,9 +189,9 @@ enable-active-high; }; - reg_usbotg_vbus: regulator@7 { + reg_usbotg_vbus: regulator@8 { compatible = "regulator-fixed"; - reg = <7>; + reg = <8>; regulator-name = "usbotg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -545,12 +559,18 @@ >; }; - pinctrl_lcd1_pwr: lcd1-pwrgrp { + pinctrl_lcd_pwr: lcd-pwrgrp { fsl,pins = < MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0 /* LCD Power Enable */ >; }; + pinctrl_lcd_reset: lcd-resetgrp { + fsl,pins = < + MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0 /* LCD RESET */ + >; + }; + pinctrl_pwm5: pwm5grp { fsl,pins = < MX6UL_PAD_NAND_DQS__PWM5_OUT 0x0b0b0 -- 2.39.2