diff mbox

[v2,5/9] ARM: dts: qcom: msm8974: Introduce the wcnss remoteproc node

Message ID 1459222625-11440-6-git-send-email-bjorn.andersson@linaro.org (mailing list archive)
State Superseded, archived
Delegated to: Andy Gross
Headers show

Commit Message

Bjorn Andersson March 29, 2016, 3:37 a.m. UTC
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@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(-)

Comments

kernel test robot March 29, 2016, 6:03 a.m. UTC | #1
Hi Bjorn,

[auto build test ERROR on v4.6-rc1]
[also build test ERROR on next-20160329]
[cannot apply to robh/for-next]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Bjorn-Andersson/Qualcomm-WCNSS-remoteproc/20160329-114231
config: arm-multi_v7_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   In file included from arch/arm/boot/dts/qcom-apq8074-dragonboard.dts:1:0:
>> arch/arm/boot/dts/qcom-msm8974.dtsi:5:42: fatal error: dt-bindings/clock/qcom,rpmcc.h: No such file or directory
    #include <dt-bindings/clock/qcom,rpmcc.h>
                                             ^
   compilation terminated.

vim +5 arch/arm/boot/dts/qcom-msm8974.dtsi

     1	/dts-v1/;
     2	
     3	#include <dt-bindings/interrupt-controller/arm-gic.h>
     4	#include <dt-bindings/clock/qcom,gcc-msm8974.h>
   > 5	#include <dt-bindings/clock/qcom,rpmcc.h>
     6	#include "skeleton.dtsi"
     7	
     8	/ {

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

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>;