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

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

Merge "ARM: dts: msm: PCIe turn-on of NTN3 regulator"

parents 923617f2 970394b4

qcom/sdxlemur-mtp-cpe-pine1x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	};

};



&ntn3_vreg {

&qps615_vreg {

	vin-supply = <&pine_vreg>;

};

qcom/sdxlemur-mtp-cpe.dtsi

+5 −5
Original line number Diff line number Diff line 
#include "sdxlemur-mtp.dtsi"



&soc {

	ntn3_vreg: ntn3_vreg {

	qps615_vreg: qps615_vreg {

		compatible = "regulator-fixed";

		regulator-name = "ntn3_vreg";

		regulator-name = "qps615_vreg";

		gpio = <&tlmm 107 GPIO_ACTIVE_HIGH>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;
@@ -15,7 +15,7 @@ 
		compatible = "regulator-fixed";

		regulator-name = "qca_vreg";

		gpio = <&tlmm 106 GPIO_ACTIVE_HIGH>;

		vin-supply = <&ntn3_vreg>;

		vin-supply = <&qps615_vreg>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		enable-active-high;
@@ -26,7 +26,7 @@ 
		compatible = "regulator-fixed";

		regulator-name = "aqr_vreg";

		gpio = <&tlmm 105 GPIO_ACTIVE_HIGH>;

		vin-supply = <&qca_vreg>;

		vin-supply = <&qps615_vreg>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

		enable-active-high;
@@ -126,7 +126,7 @@ 
&pcie0 {

	pcie-i2c-phandle = <&i2c_5>;



	vreg-3p3-supply = <&aqr_vreg>;

	vreg-3p3-supply = <&qps615_vreg>;



	iommu-map = <0x0 &apps_smmu 0x0200 0x1>,

		<0x100 &apps_smmu 0x0201 0x1>,

qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi

+4 −4
Original line number Diff line number Diff line 
#include "sdxlemur-mtp-mbb.dtsi"



&soc {

	ntn3_vreg: ntn3_vreg {

	qps615_vreg: qps615_vreg {

		compatible = "regulator-fixed";

		regulator-name = "ntn3_vreg";

		regulator-name = "qps615_vreg";

		gpio = <&tlmm 107 GPIO_ACTIVE_HIGH>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;
@@ -15,7 +15,7 @@ 
		compatible = "regulator-fixed";

		regulator-name = "aqr_vreg";

		gpio = <&tlmm 105 GPIO_ACTIVE_HIGH>;

		vin-supply = <&ntn3_vreg>;

		vin-supply = <&qps615_vreg>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

		enable-active-high;
@@ -72,7 +72,7 @@ 


	qcom,filtered-bdfs = <0x02080000>;



	vreg-3p3-supply = <&aqr_vreg>;

	vreg-3p3-supply = <&qps615_vreg>;



	iommu-map = <0x0 &apps_smmu 0x0200 0x1>,

		<0x100 &apps_smmu 0x0201 0x1>,