Skip to contentSkip to conversation

arm64: dts: marvell: change regulator-gpio to regulator-fixed

PATCH In review Rob Herring (Arm) 2 participants 2 messages Jan 5 – Jan 7

Subsystems (2)
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 arm64: dts: marvell: change regulator-gpio to regulator-fixed

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.

---
 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(-)
arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +2 -7
index 9f4bafeddd82..a881a3326dba 100644
@@ -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 {
arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi +2 -1
index 6f3914bcfd01..71c225221617 100644
@@ -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;
 };
 
Signature · 1 line
2.51.0
maintainer
#1 lore raw
Quoted 5 lines · 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.

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 46 lines
---
 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(-)
arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +2 -7
index 9f4bafeddd82..a881a3326dba 100644
@@ -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 {
arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi +2 -1
index 6f3914bcfd01..71c225221617 100644
@@ -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;
 };
 
Signature · 1 line
2.51.0
Signature · 3 lines
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com