Merge tag 'powerpc-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / qcom-msm8974-fairphone-fp2.dts

diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
index 2616039..d2d4877 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
@@ -259,6 +259,25 @@
                status = "ok";
        };
 
+       remoteproc@fb21b000 {
+               status = "ok";
+
+               vddmx-supply = <&pm8841_s1>;
+               vddcx-supply = <&pm8841_s2>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&wcnss_pin_a>;
+
+               smd-edge {
+                       qcom,remote-pid = <4>;
+                       label = "pronto";
+
+                       wcnss {
+                               status = "ok";
+                       };
+               };
+       };
+
        pinctrl@fd510000 {
                sdhc1_pin_a: sdhc1-pin-active {
                        clk {
@@ -287,6 +306,32 @@
                                bias-pull-up;
                        };
                };
+
+               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;
+                       };
+               };
        };
 
        sdhci@f9824900 {