From: Bjorn Andersson <bjorn.anders...@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.anders...@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.anders...@linaro.org>
---
Changes since v1:
- Added dts patches
.../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 32 +++++++++++++++++++
arch/arm/boot/dts/qcom-msm8974.dtsi | 36 +++++++++++++++++++++-
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
index a0398b69f4f2..74faa291d213 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
@@ -311,6 +311,13 @@
pinctrl-0 = <&blsp1_uart2_pin_a>;
};
+ wcnss-rproc@fb21b000 {
+ status = "ok";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&wcnss_pin_a>;
+ };
+
pinctrl@fd510000 {
blsp1_uart2_pin_a: blsp1-uart2-pin-active {
rx {
@@ -366,6 +373,31 @@
};
};
+ wcnss_pin_a: wcnss-pin-active {
+ wlan {
+ pins = "gpio36", "gpio37", "gpio38", "gpio39",
"gpio40";
+ function = "wlan";
+
+ drive-strength = <6>;
+ bias-pull-down;
+ };
+
+ bt {
+ pins = "gpio35", "gpio43", "gpio44";
+ function = "bt";
+
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+
+ fm {
+ pins = "gpio41", "gpio42";
+ function = "fm";
+
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
index ef5330578431..5c0d1a46baeb 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -2,6 +2,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
+#include <dt-bindings/clock/qcom,rpmcc.h>
#include "skeleton.dtsi"
/ {
@@ -24,7 +25,7 @@
no-map;
};
- reserved@0d200000 {
+ wcnss_region: wcnss@0d200000 {
reg = <0x0d200000 0xa00000>;
no-map;
};
@@ -430,6 +431,39 @@
clock-names = "core";
};
+ wcnss-rproc@fb21b000 {
+ compatible = "qcom,pronto-v2-pil";
+ reg = <0xfb21b000 0x3000>;
+
+ memory-region = <&wcnss_region>;
+
+ interrupts-extended = <&intc 0 149
IRQ_TYPE_EDGE_RISING>,
+ <&wcnss_smp2p_in 0
IRQ_TYPE_EDGE_RISING>,
+ <&wcnss_smp2p_in 1
IRQ_TYPE_EDGE_RISING>,
+ <&wcnss_smp2p_in 2
IRQ_TYPE_EDGE_RISING>,
+ <&wcnss_smp2p_in 3
IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "wdog", "fatal", "ready", "handover",
"stop-ack";
+
+ vddpx-supply = <&pm8941_s3>;
+
+ qcom,state = <&wcnss_smp2p_out 0>;
+ qcom,state-names = "stop";
+
+ status = "disabled";
+
+ iris {
+ compatible = "qcom,wcn3680";
+
+ clocks = <&rpmcc RPM_CXO_A2>;
+ clock-names = "xo";
+
+ vddxo-supply = <&pm8941_l6>;
+ vddrfa-supply = <&pm8941_l11>;
+ vddpa-supply = <&pm8941_l19>;
+ vdddig-supply = <&pm8941_s3>;
+ };
+ };
+
msmgpio: pinctrl@fd510000 {
compatible = "qcom,msm8974-pinctrl";
reg = <0xfd510000 0x4000>;
--
2.5.0
