From ed05352f5c0b0ecdd16b66283600049034c037d7 Mon Sep 17 00:00:00 2001
From: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Date: Thu, 3 Nov 2016 14:54:19 +0530
Subject: [PATCH] ARM: dts: msm: update ICNSS DT node for msmcobalt interposer
The msmcobalt interposer target has interposed with pm_falcon pmic.
Remove the pm_cobalt regulator handler reference, clock and smmu
memory address and offset from the ICNSS DT node. Allow ICNSS DT
node compilation for msmcobalt interposer target.
CRs-Fixed: 1085547
Change-Id: I4aa1b9876bf1afd9b895d89dc5c4323ba3a3f661
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
---
.../dts/qcom/msmcobalt-interposer-msmfalcon.dtsi | 13 +------------
.../dts/qcom/msmcobalt-interposer-pmfalcon.dtsi | 1 -
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi
index 6e1f3a06f3ff..32f616e1dc7a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi
@@ -2868,6 +2868,7 @@
};
qcom,icnss@18800000 {
+ status = "disabled";
compatible = "qcom,icnss";
reg = <0x18800000 0x800000>,
<0x10AC000 0x20>,
@@ -2875,10 +2876,6 @@
<0xb0000000 0x10000>;
reg-names = "membase", "mpm_config",
"smmu_iova_base", "smmu_iova_ipa";
- clocks = <&clock_gcc clk_rf_clk2_pin>;
- clock-names = "cxo_ref_clk_pin";
- iommus = <&anoc2_smmu 0x1900>,
- <&anoc2_smmu 0x1901>;
interrupts = <0 413 0 /* CE0 */ >,
<0 414 0 /* CE1 */ >,
<0 415 0 /* CE2 */ >,
@@ -2892,14 +2889,6 @@
<0 424 0 /* CE10 */ >,
<0 425 0 /* CE11 */ >;
qcom,wlan-msa-memory = <0x100000>;
- vdd-0.8-cx-mx-supply = <&pmcobalt_l5>;
- vdd-1.8-xo-supply = <&pmcobalt_l7_pin_ctrl>;
- vdd-1.3-rfa-supply = <&pmcobalt_l17_pin_ctrl>;
- vdd-3.3-ch0-supply = <&pmcobalt_l25_pin_ctrl>;
- qcom,vdd-0.8-cx-mx-config = <800000 800000>;
- qcom,vdd-3.3-ch0-config = <3104000 3312000>;
- qcom,icnss-vadc = <&pmcobalt_vadc>;
- qcom,icnss-adc_tm = <&pmcobalt_adc_tm>;
};
tspp: msm_tspp@0c1e7000 {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi
index 454f71ba54be..274281f7c982 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi
@@ -243,7 +243,6 @@
/delete-node/qcom,msm-thermal;
/delete-node/qcom,ssc@5c00000;
/delete-node/qcom,spss@1d00000;
- /delete-node/qcom,icnss@18800000;
/delete-node/qcom,wil6210;
/delete-node/qcom,rpm-smd;
/delete-node/qcom,spmi@800f000;