ARM: dts: imx6q-cm-fx6: Use the 'vpcie-supply' property

According to Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt,
the property for specifying the PCIe regulator is 'vpcie-supply', so
use the correct one.

Also fix the polarity of GPIO2_24 so that the regulator can operate
correctly.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Tested-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index fe6ab0aa34f9dd5f7b5d0fb19b6c9be4858fb9d9..bc7587c383f687b72abc736809a7826e73840dca 100644 (file)
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -77,8 +77,7 @@
                regulator-name = "regulator-pcie-power-on-gpio";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
-               gpio = <&gpio2 24 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
+               gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
        };
 
        reg_usb_h1_vbus: usb_h1_vbus {
@@ -362,7 +361,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pcie>;
        reset-gpio = <&gpio1 26 GPIO_ACTIVE_LOW>;
-       vdd-supply = <&reg_pcie_power_on_gpio>;
+       vpcie-supply = <&reg_pcie_power_on_gpio>;
        status = "okay";
 };