Commit e98d9802 authored by Lucas Stach's avatar Lucas Stach Committed by Shawn Guo
Browse files

arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance 



When adding the sound support a second instance of the GEN_3V3 regulator was
added by accident. Remove it and point the consumers to the first instance.

Fixes: 663a5b5e ("arm64: dts: zii-ultra: add sound support")
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent dabea675

arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts

+5 −5
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ 
		pinctrl-0 = <&pinctrl_codec2>;

		reg = <0x18>;

		#sound-dai-cells = <0>;

		HPVDD-supply = <&reg_3p3v>;

		SPRVDD-supply = <&reg_3p3v>;

		SPLVDD-supply = <&reg_3p3v>;

		AVDD-supply = <&reg_3p3v>;

		IOVDD-supply = <&reg_3p3v>;

		HPVDD-supply = <&reg_gen_3p3>;

		SPRVDD-supply = <&reg_gen_3p3>;

		SPLVDD-supply = <&reg_gen_3p3>;

		AVDD-supply = <&reg_gen_3p3>;

		IOVDD-supply = <&reg_gen_3p3>;

		DVDD-supply = <&vgen4_reg>;

		reset-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;

	};

arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi

+5 −14
Original line number Diff line number Diff line
@@ -77,15 +77,6 @@ 
		regulator-always-on;

	};



	reg_3p3v: regulator-3p3v {

		compatible = "regulator-fixed";

		vin-supply = <&reg_3p3_main>;

		regulator-name = "GEN_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	reg_usdhc2_vmmc: regulator-vsd-3v3 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_reg_usdhc2>;
@@ -415,11 +406,11 @@ 
		pinctrl-0 = <&pinctrl_codec1>;

		reg = <0x18>;

		#sound-dai-cells = <0>;

		HPVDD-supply = <&reg_3p3v>;

		SPRVDD-supply = <&reg_3p3v>;

		SPLVDD-supply = <&reg_3p3v>;

		AVDD-supply = <&reg_3p3v>;

		IOVDD-supply = <&reg_3p3v>;

		HPVDD-supply = <&reg_gen_3p3>;

		SPRVDD-supply = <&reg_gen_3p3>;

		SPLVDD-supply = <&reg_gen_3p3>;

		AVDD-supply = <&reg_gen_3p3>;

		IOVDD-supply = <&reg_gen_3p3>;

		DVDD-supply = <&vgen4_reg>;

		reset-gpios = <&gpio3 3 GPIO_ACTIVE_LOW>;

	};