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

[PATCH v2 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>
---
Changes since v1:
- None

 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 v2 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 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.

Cc: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
Changes since v1:
- Also fix the GPIO2_24 polarity. (Christopher)

 arch/arm/boot/dts/imx6q-cm-fx6.dts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

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

[Christopher Spinrath]

On 10/15/2017 10:53 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> 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.
> 
> Cc: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

Tested-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>

Thanks!
Christopher

> ---
> Changes since v1:
> - Also fix the GPIO2_24 polarity. (Christopher)
> 
>  arch/arm/boot/dts/imx6q-cm-fx6.dts | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
> index fe6ab0a..bc7587c 100644
> --- 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";
>  };
>  
> 

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

[Marek Vasut]

On 10/15/2017 10:53 PM, Fabio Estevam wrote:
> 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>

Reviewed-by: Marek Vasut <marex@denx.de>

> ---
> Changes since v1:
> - None
> 
>  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";
>  };
>  
> 


-- 
Best regards,
Marek Vasut

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

[Shawn Guo]

On Sun, Oct 15, 2017 at 06:53:57PM -0200, Fabio Estevam wrote:
> 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>

Applied both, thanks.