Skip to content

Commit dd1aadd

Browse files
robherringgclement
authored andcommitted
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>
1 parent e509bd5 commit dd1aadd

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,11 @@
2626
};
2727

2828
vcc_sd_reg1: regulator {
29-
compatible = "regulator-gpio";
29+
compatible = "regulator-fixed";
3030
regulator-name = "vcc_sd1";
31-
regulator-min-microvolt = <1800000>;
31+
regulator-min-microvolt = <3300000>;
3232
regulator-max-microvolt = <3300000>;
3333
regulator-boot-on;
34-
35-
gpios-states = <0>;
36-
states = <1800000 0x1
37-
3300000 0x0>;
38-
enable-active-high;
3934
};
4035

4136
keys {

arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
};
1616

1717
&ap0_reg_sd_vccq {
18+
compatible = "regulator-fixed";
1819
regulator-max-microvolt = <1800000>;
19-
states = <1800000 0x1 1800000 0x0>;
20+
/delete-property/ states;
2021
/delete-property/ gpios;
2122
};
2223

0 commit comments

Comments
 (0)