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.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

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 9f4bafeddd82f79de5bb88ab2b5b427254fc6221..a881a3326dbab3daaea929128a07c75b0672aa72 100644 (file)
--- 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 @@
        };
 
        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 6f3914bcfd01e39ae90c4713f970506de096671d..71c2252216171a98f8ab374a803255ca2e64adb5 100644 (file)
--- 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;
 };