Commit dd1aadd2 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Gregory CLEMENT
Browse files

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: default avatarRob Herring (Arm) <robh@kernel.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent e509bd56

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

+2 −7
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

};