From aba8070ca2dbb941788a5f5eea714e3cf8a44b65 Mon Sep 17 00:00:00 2001 From: yourname Date: Mon, 21 Mar 2016 10:16:58 -0700 Subject: [PATCH] USB and other regulators removed from dtsi, PCIE reset pin corrected --- arch/arm/boot/dts/imx6qdl-openrex.dtsi | 51 +------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-openrex.dtsi b/arch/arm/boot/dts/imx6qdl-openrex.dtsi index e0429d59..955d0e77 100644 --- a/arch/arm/boot/dts/imx6qdl-openrex.dtsi +++ b/arch/arm/boot/dts/imx6qdl-openrex.dtsi @@ -34,52 +34,6 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <0>; - - reg_usb_otg_vbus: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "usb_otg_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio3 22 0>; - enable-active-high; - }; - - reg_usb_h1_vbus: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "usb_h1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 29 0>; - enable-active-high; - }; - - reg_audio: regulator@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "wm8962-supply"; - gpio = <&gpio4 10 0>; - enable-active-high; - }; - - reg_mipi_dsi_pwr_on: mipi_dsi_pwr_on { - compatible = "regulator-fixed"; - regulator-name = "mipi_dsi_pwr_on"; - gpio = <&gpio6 14 0>; - enable-active-high; - }; - - reg_sensor: regulator@3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "sensor-supply"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio2 31 0>; - startup-delay-us = <500>; - enable-active-high; - }; }; gpio-keys { @@ -434,8 +388,7 @@ }; &pcie { - power-on-gpio = <&gpio3 19 0>; - reset-gpio = <&gpio7 12 0>; + reset-gpio = <&gpio4 15 0>; status = "disabled"; }; @@ -457,12 +410,10 @@ }; &usbh1 { - vbus-supply = <®_usb_h1_vbus>; status = "okay"; }; &usbotg { - vbus-supply = <®_usb_otg_vbus>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbotg>; disable-over-current;