[PATCH] arm64: dts: marvell: change regulator-gpio to regulator-fixed

[PATCH] arm64: dts: marvell: change regulator-gpio to regulator-fixed

[Rob Herring (Arm)]

A "regulator-gpio" must have a GPIO control, hence the name. There's no
GPIO on a couple of Marvell platforms at least as far as the DT is
defined, so change the regulator type from GPIO to fixed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts | 9 ++-------
 arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index 9f4bafeddd82..a881a3326dba 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -26,16 +26,11 @@ memory@0 {
 	};
 
 	vcc_sd_reg1: regulator {
-		compatible = "regulator-gpio";
+		compatible = "regulator-fixed";
 		regulator-name = "vcc_sd1";
-		regulator-min-microvolt = <1800000>;
+		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		regulator-boot-on;
-
-		gpios-states = <0>;
-		states = <1800000 0x1
-			3300000 0x0>;
-		enable-active-high;
 	};
 
 	keys {
diff --git a/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
index 6f3914bcfd01..71c225221617 100644
--- a/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
@@ -15,8 +15,9 @@ / {
 };
 
 &ap0_reg_sd_vccq {
+	compatible = "regulator-fixed";
 	regulator-max-microvolt = <1800000>;
-	states = <1800000 0x1 1800000 0x0>;
+	/delete-property/ states;
 	/delete-property/ gpios;
 };
 
-- 
2.51.0

Re: [PATCH] arm64: dts: marvell: change regulator-gpio to regulator-fixed

[Gregory CLEMENT]

"Rob Herring (Arm)" <robh@kernel.org> writes:

> A "regulator-gpio" must have a GPIO control, hence the name. There's no
> GPIO on a couple of Marvell platforms at least as far as the DT is
> defined, so change the regulator type from GPIO to fixed.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
>  arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts | 9 ++-------
>  arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi | 3 ++-
>  2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
> index 9f4bafeddd82..a881a3326dba 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
> @@ -26,16 +26,11 @@ memory@0 {
>  	};
>  
>  	vcc_sd_reg1: regulator {
> -		compatible = "regulator-gpio";
> +		compatible = "regulator-fixed";
>  		regulator-name = "vcc_sd1";
> -		regulator-min-microvolt = <1800000>;
> +		regulator-min-microvolt = <3300000>;
>  		regulator-max-microvolt = <3300000>;
>  		regulator-boot-on;
> -
> -		gpios-states = <0>;
> -		states = <1800000 0x1
> -			3300000 0x0>;
> -		enable-active-high;
>  	};
>  
>  	keys {
> diff --git a/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
> index 6f3914bcfd01..71c225221617 100644
> --- a/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
> +++ b/arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
> @@ -15,8 +15,9 @@ / {
>  };
>  
>  &ap0_reg_sd_vccq {
> +	compatible = "regulator-fixed";
>  	regulator-max-microvolt = <1800000>;
> -	states = <1800000 0x1 1800000 0x0>;
> +	/delete-property/ states;
>  	/delete-property/ gpios;
>  };
>  
> -- 
> 2.51.0
>

-- 
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com