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

Commit e544800f 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: fix dt entry of gdsc_vdd-supply for fsm9900"

parents 3a7667bf 4c1a2a76

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

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ 
		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pma8084_gpios 16 0>;

		regulator-boot-on;

	};

	pcie1_power_en_vreg: pcie1_power_en_vreg {

		compatible = "regulator-fixed";
@@ -278,5 +279,6 @@ 
		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pma8084_gpios 22 0>;

		regulator-boot-on;

	};

};

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

+4 −5
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ 
		wake-gpio = <&msmgpio 35 0>;

		clkreq-gpio = <&msmgpio 32 0>;



		gdsc_vdd-supply = <&gdsc_pcie_0>;

		gdsc-vdd-supply = <&gdsc_pcie_0>;

		vreg-1.8-supply = <&pma8084_l12>;

		vreg-0.9-supply = <&pma8084_l3>;

		vreg-3.3-supply = <&pcie0_power_en_vreg>;
@@ -1249,7 +1249,6 @@ 
	};



	pcie1: qcom,pcie@fc528000 {

		status = "disabled";

		compatible = "qcom,msm_pcie";

		cell-index = <1>;

		qcom,ctrl-amt = <1>;
@@ -1293,7 +1292,7 @@ 
		wake-gpio = <&msmgpio 141 0>;

		clkreq-gpio = <&msmgpio 28 0>;



		gdsc_vdd-supply = <&gdsc_pcie_1>;

		gdsc-vdd-supply = <&gdsc_pcie_1>;

		vreg-1.8-supply = <&pma8084_l12>;

		vreg-0.9-supply = <&pma8084_l3>;

		vreg-3.3-supply = <&pcie1_power_en_vreg>;
@@ -1309,11 +1308,11 @@ 
};



&gdsc_pcie_0{

	status = "ok";

	status = "disabled";

};



&gdsc_pcie_1{

	status = "ok";

	status = "disabled";

};



#include "msm-pma8084.dtsi"