Commit 41112431 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

arm64: dts: meson-gxbb-vega-s95: fix regulators 



Align the regulator names with other GXBB SoCS for upcoming
SARADC support and SDIO/SDCard fixes.
Also fix how regulators are passed to MMC controllers & USB.

Suggested-by: default avatarChristian Hewitt <christianshewitt@gmail.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 55c2440d

arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

+21 −13
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
		};

	};



	usb_vbus: regulator-usb0-vbus {

	usb_pwr: regulator-usb-pwrs {

		compatible = "regulator-fixed";



		regulator-name = "USB0_VBUS";

		regulator-name = "USB_PWR";



		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -40,18 +40,25 @@ 
		enable-active-high;

	};



	vcc_3v3: regulator-vcc_3v3 {

	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		regulator-name = "VCC_3V3";

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	vcc_1v8: regulator-vcc_1v8 {

	vcc_3v3: regulator-vcc_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	emmc_pwrseq: emmc-pwrseq {
@@ -133,8 +140,8 @@ 


	mmc-pwrseq = <&sdio_pwrseq>;



	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vcc_1v8>;

	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;



	brcmf: wifi@1 {

		reg = <1>;
@@ -156,7 +163,8 @@ 


	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vcc_3v3>;

	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vcc_3v3>;

};



/* eMMC */
@@ -176,7 +184,7 @@ 


	mmc-pwrseq = <&emmc_pwrseq>;

	vmmc-supply = <&vcc_3v3>;

	vmmcq-sumpply = <&vcc_1v8>;

	vqmmc-supply = <&vddio_boot>;

};



&uart_AO {
@@ -187,7 +195,7 @@ 


&usb0_phy {

	status = "okay";

	phy-supply = <&usb_vbus>;

	phy-supply = <&usb_pwr>;

};



&usb1_phy {

CRA Git | Maintained and supported by SUSTech CRA and CCSE