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

Commit a6f71cfa authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge b38030d4 on remote branch 

Change-Id: I8240c9b052eda60ea13e0ada25c3ee17de67ec8a
parents 1fa5094d b38030d4

bindings/usb/qcom,dwc3.txt

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ Optional properties: 
- qcom,select-utmi-as-pipe-clk: if present, disable USB3 pipe_clk requirement.

				Used when dwc3 operates without SSPHY and only

				HS/FS/LS modes are supported.

- qcom,iommu-best-fit-algo:	If present, enables best fit algorithm for iova

				allocation. This helps in reducing fragmentation

				and utilizing the iova address space more

				efficiently.



Required child node:

A child node must exist to represent the core DWC3 IP block. The name of

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.dts

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "sdxlemur-1024mb-cpe.dtsi"

#include "sdxlemur-audio.dtsi"

#include "sdxlemur-mtp-audio-overlay.dtsi"

#include "sdxlemur-bluetooth.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE";

qcom/sdxlemur-mtp-cpe.dtsi

+24 −8
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,22 +15,22 @@ 
		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;

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

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

	};



	aqr_vreg: aqr_vreg {

		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;

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

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

	};



	ioss_aqr_rx: qps615_rx@eth0 {
@@ -118,7 +118,13 @@ 
					0x82bd00 0x8

					0x82c030 0x8

					0x828000 0x1

					0x82bd00 0x8>;

					0x82bd00 0x8

					0x82c01c 0x10

					0x82c030 0xf

					0x828000 0xf

					0x82b268 0x2

					0x82C02C 0x4

					0x8249DC 0x0>;

	};

};
@@ -126,7 +132,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>,
@@ -171,6 +177,11 @@ 
				qcom,ioss = <&ioss>;

				qcom,ioss_interfaces = <&ioss_qps615_eth0>;



				qcom,ioss_instance = <0>;

				qcom,ioss_channels =

					<&ioss_aqr_rx>,

					<&ioss_aqr_tx>;



				interrupts-extended = <&tlmm 103 IRQ_TYPE_EDGE_FALLING>;

				interrupt-names = "wol_irq";
@@ -201,6 +212,11 @@ 
				qcom,ioss = <&ioss>;

				qcom,ioss_interfaces = <&ioss_qps615_eth1>;



				qcom,ioss_instance = <1>;

				qcom,ioss_channels =

					<&ioss_napa_rx>,

					<&ioss_napa_tx>;



				interrupts-extended = <&tlmm 81 IRQ_TYPE_EDGE_FALLING>;

				interrupt-names = "wol_irq";

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

+10 −5
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,11 +15,11 @@ 
		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;

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

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

	};



	ioss_qps615_rx: qps615_rx@eth {
@@ -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>,
@@ -111,6 +111,11 @@ 
				qcom,ioss = <&ioss>;

				qcom,ioss_interfaces = <&ioss_qps615_eth0>;



				qcom,ioss_instance = <0>;

				qcom,ioss_channels =

					<&ioss_qps615_rx>,

					<&ioss_qps615_tx>;



				/* ipa shares this group */

				qcom,iommu-group = <&ipa_eth_group1>;

				phy-supply = <&aqr_vreg>;