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

Commit f7196127 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 8b10b1d5 2522f5c6

arch/arm64/boot/dts/qcom/sdxprairie-regulator.dtsi

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

		regulator-max-microvolt = <3300000>;

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

		gpio = <&tlmm 89 GPIO_ACTIVE_HIGH>;

		gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;

		enable-active-high;

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

		regulator-max-microvolt = <2500000>;

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

		gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;

		gpio = <&tlmm 89 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

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

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

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

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

		qcom,emac-pps0-test-intr = <&tlmm 31 GPIO_ACTIVE_LOW>;

		vreg_rgmii-supply = <&pmxprairie_vref_rgmii>;

		vreg_emac_phy-supply =  <&vreg_emac_phy>;