[PATCH 1/2] ARM: dts: imx6q-novena: Use the 'vpcie-supply' property

[PATCH 1/2] ARM: dts: imx6q-novena: Use the 'vpcie-supply' property

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Since commit c26ebe98a103 ("PCI: imx6: Add regulator support"), it is
possible to pass the 'vpcie-supply' property to describe the PCIE supply.

This way we can remove the 'regulator-always-on' property from the
regulator and have a better device tree description.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 arch/arm/boot/dts/imx6q-novena.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index d83cfb6..eadc371 100644
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -158,7 +158,6 @@
 		regulator-max-microvolt = <1500000>;
 		gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
-		regulator-always-on;
 	};
 
 	reg_sata: regulator-sata {
@@ -447,6 +446,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pcie_novena>;
 	reset-gpio = <&gpio3 29 GPIO_ACTIVE_LOW>;
+	vpcie-supply = <&reg_pcie>;
 	status = "okay";
 };
 
-- 
2.7.4

[PATCH 2/2] ARM: dts: imx6q-cm-fx6: Use the 'vpcie-supply' property

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

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

Cc: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index fe6ab0a..5c1b1c3 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -362,7 +362,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";
 };
 
-- 
2.7.4

[PATCH 2/2] ARM: dts: imx6q-cm-fx6: Use the 'vpcie-supply' property

[Christopher Spinrath]

Hi Fabio,

On 10/15/2017 10:19 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> According to Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt,
> the correct property for specifying the PCIe regulator is 'vpcie-supply',
> so use the correct one.
> 
> Cc: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
> index fe6ab0a..5c1b1c3 100644
> --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
> +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
> @@ -362,7 +362,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";
>  };
>

Unfortunately, this change breaks the PCI support on the Utilite (which
is based on the cm-fx6). Without this change the regulator framework
disables the pcie/vdd regulator and by doing so actually activates it
(which is weird and should definitely be changed).

With the following additional diff, which sets the correct polarity of
the regulator, it works again:

--- 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 {

Cheers,
Christopher

[PATCH 2/2] ARM: dts: imx6q-cm-fx6: Use the 'vpcie-supply' property

[Fabio Estevam]

Hi Christopher ,

On Sun, Oct 15, 2017 at 6:46 PM, Christopher Spinrath
<christopher.spinrath@rwth-aachen.de> wrote:

> Unfortunately, this change breaks the PCI support on the Utilite (which
> is based on the cm-fx6). Without this change the regulator framework
> disables the pcie/vdd regulator and by doing so actually activates it
> (which is weird and should definitely be changed).
>
> With the following additional diff, which sets the correct polarity of
> the regulator, it works again:

Thanks, just sent v2 with the polarity fix.