Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c14cf2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Correct the GPIO numbers"

parents bfd2635d 8f5caa88

arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-enable-ramp-delay = <100>;

		gpio = <&tlmm 96 GPIO_ACTIVE_HIGH>;

		gpio = <&tlmm 83 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};
@@ -401,7 +401,7 @@ 
		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

		regulator-enable-ramp-delay = <100>;

		gpio = <&tlmm 83 GPIO_ACTIVE_HIGH>;

		gpio = <&tlmm 96 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,7 @@ 
			"eth_rgmii_clk", "eth_slave_ahb_clk";

		qcom,phy-intr-redirect = <&tlmm 84 GPIO_ACTIVE_LOW>;

		qcom,phy-reset = <&tlmm 85 GPIO_ACTIVE_LOW>;

		qcom,phy-reset-delay-msecs = <10>;

		vreg_rgmii-supply = <&vreg_rgmii>;

		vreg_emac_phy-supply =  <&vreg_emac_phy>;

		vreg_rgmii_io_pads-supply = <&vreg_rgmii_io_pads>;