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

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

Merge "ARM: dts: msm: Move icnss driver to soc node"

parents 3019aaa8 d4fe9282

qcom/scuba-iot.dtsi

+36 −37
Original line number Diff line number Diff line
@@ -1029,6 +1029,42 @@ dcc: dcc_v2@1be2000 { 
		qcom,firmware-name = "venus";

		memory-region = <&pil_video_mem>;

	};



	icnss: qcom,icnss@C800000 {

		compatible = "qcom,icnss";

		reg = <0xC800000 0x800000>,

		      <0xb0000000 0x10000>;

		reg-names = "membase", "smmu_iova_ipa";

		iommus = <&apps_smmu 0x1A0 0x1>;

		interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,

			     <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,

			     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,

			     <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,

			     <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,

			     <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,

			     <GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,

			     <GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,

			     <GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,

			     <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,

			     <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH /* CE10 */ >,

			     <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH /* CE11 */ >;

		qcom,iommu-dma = "fastmap";

		qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";

		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;

		qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;

		vdd-cx-mx-supply = <&L7A>;

		vdd-1.8-xo-supply = <&L13A>;

		vdd-1.3-rfa-supply = <&L10A>;

		vdd-3.3-ch0-supply = <&L22A>;

		qcom,vdd-cx-mx-config = <640000 640000>;

		qcom,vdd-3.3-ch0-config = <3000000 3312000>;

		qcom,smp2p_map_wlan_1_in {

			interrupts-extended = <&smp2p_wlan_1_in 0 0>,

					      <&smp2p_wlan_1_in 1 0>;

			interrupt-names = "qcom,smp2p-force-fatal-error",

					  "qcom,smp2p-early-crash-ind";

		};

	};

};



#include "pm2250.dtsi"
@@ -1202,43 +1238,6 @@ dcc: dcc_v2@1be2000 { 
		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};





	icnss: qcom,icnss@C800000 {

		compatible = "qcom,icnss";

		reg = <0xC800000 0x800000>,

		      <0xb0000000 0x10000>;

		reg-names = "membase", "smmu_iova_ipa";

		iommus = <&apps_smmu 0x1A0 0x1>;

		interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,

			     <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,

			     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,

			     <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,

			     <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,

			     <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,

			     <GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,

			     <GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,

			     <GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,

			     <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,

			     <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH /* CE10 */ >,

			     <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH /* CE11 */ >;

		qcom,iommu-dma = "fastmap";

		qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";

		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;

		qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;

		vdd-cx-mx-supply = <&L7A>;

		vdd-1.8-xo-supply = <&L13A>;

		vdd-1.3-rfa-supply = <&L10A>;

		vdd-3.3-ch0-supply = <&L22A>;

		qcom,vdd-cx-mx-config = <640000 640000>;

		qcom,vdd-3.3-ch0-config = <3000000 3312000>;

		qcom,smp2p_map_wlan_1_in {

			interrupts-extended = <&smp2p_wlan_1_in 0 0>,

					      <&smp2p_wlan_1_in 1 0>;

			interrupt-names = "qcom,smp2p-force-fatal-error",

					  "qcom,smp2p-early-crash-ind";

		};

	};

};



&pm2250_gpios {