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

Commit 17197cd2 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: Add SMMU support for EMAC in sdxpoorwills"

parents f3b4afa9 e49ab993
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ emac_hw node:
- reg: Offset and length of the register regions for the mac and io-macro
- interrupts: Interrupt number used by this controller
- io-macro-info: Internal io-macro-info
- emac_emb_smmu: Internal emac smmu node

Optional:
- qcom,msm-bus,name: String representing the client-name
@@ -20,16 +21,25 @@ Optional:
                             in KBps, instantaneous bandwidth in KBps
qcom,bus-vector-names: specifies string IDs for the corresponding bus vectors
                       in the same order as qcom,msm-bus,vectors-KBps property.
- qcom,arm-smmu: Boolean, if present enables EMAC SMMU support in sdxpoorwills.

Internal io-macro-info:
- io-macro-bypass-mode: <0 or 1> internal or external delay configuration
- io-interface: <rgmii/mii/rmii> PHY interface used

Internal emac_emb_smmu:
- compatible: Should be "qcom,emac-smmu-embedded".
- qcom,smmu-s1-bypass: Boolean, if present S1 bypass is enabled.
- iommus: Includes the <&smmu_phandle stream_id size> pair for each context
			bank.
- qcom,iova-mapping: <starting_address size> of the smmu context bank.

Example:

soc {
	emac_hw: qcom,emac@00020000 {
			compatible = "qcom,emac-dwc-eqos";
			qcom,arm-smmu;
			reg = <0x20000 0x10000>,
				  <0x36000 0x100>;
			reg-names = "emac-base", "rgmii-base";
@@ -57,5 +67,12 @@ soc {
				io-macro-bypass-mode = <0>;
				io-interface = "rgmii";
			};

			emac_emb_smmu: emac_emb_smmu {
				compatible = "qcom,emac-smmu-embedded";
				qcom,smmu-s1-bypass;
				iommus = <&apps_smmu 0x220 0xf>;
				qcom,iova-mapping = <0x80000000 0x40000000>;
			};
		};
}
+8 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,7 @@
&soc {
	emac_hw: qcom,emac@00020000 {
		compatible = "qcom,emac-dwc-eqos";
		qcom,arm-smmu;
		reg = <0x20000 0x10000>,
			<0x36000 0x100>,
			<0x3900000 0x300000>;
@@ -1277,6 +1278,13 @@
			io-macro-bypass-mode = <0>;
			io-interface = "rgmii";
		};

		emac_emb_smmu: emac_emb_smmu {
			compatible = "qcom,emac-smmu-embedded";
			qcom,smmu-s1-bypass;
			iommus = <&apps_smmu 0x220 0xf>;
			qcom,iova-mapping = <0x80000000 0x40000000>;
		};
	};

	ess-instance {