Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-msm8974.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 49d579f288654aace0b7a2b630286a10322f8136..d3e1a61b86710ee017adec7c243e5ce2878d0252 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -3,6 +3,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8974.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/reset/qcom,gcc-msm8974.h>
 #include "skeleton.dtsi"
 
 / {
@@ -30,7 +31,7 @@
                        no-map;
                };
 
-               adsp@0dc00000 {
+               adsp_region: adsp@0dc00000 {
                        reg = <0x0dc00000 0x1900000>;
                        no-map;
                };
@@ -59,11 +60,6 @@
                        reg = <0x0fd80000 0x180000>;
                        no-map;
                };
-
-               unused@0ff00000 {
-                       reg = <0x0ff00000 0x10100000>;
-                       no-map;
-               };
        };
 
        cpus {
@@ -242,6 +238,24 @@
                clock-frequency = <19200000>;
        };
 
+       adsp-pil {
+               compatible = "qcom,msm8974-adsp-pil";
+
+               interrupts-extended = <&intc 0 162 IRQ_TYPE_EDGE_RISING>,
+                                     <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                     <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                     <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                     <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+               interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+               cx-supply = <&pm8841_s2>;
+
+               memory-region = <&adsp_region>;
+
+               qcom,smem-states = <&adsp_smp2p_out 0>;
+               qcom,smem-state-names = "stop";
+       };
+
        smem {
                compatible = "qcom,smem";
 
@@ -251,6 +265,31 @@
                hwlocks = <&tcsr_mutex 3>;
        };
 
+       smp2p-adsp {
+               compatible = "qcom,smp2p";
+               qcom,smem = <443>, <429>;
+
+               interrupt-parent = <&intc>;
+               interrupts = <0 158 IRQ_TYPE_EDGE_RISING>;
+
+               qcom,ipc = <&apcs 8 10>;
+
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <2>;
+
+               adsp_smp2p_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+
+               adsp_smp2p_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
        smp2p-modem {
                compatible = "qcom,smp2p";
                qcom,smem = <435>, <428>;
@@ -655,11 +694,56 @@
                        #dma-cells = <1>;
                        qcom,ee = <0>;
                };
+
+               usb1_phy: usb-phy@f9a55000 {
+                       compatible = "qcom,usb-otg-snps";
+
+                       reg = <0xf9a55000 0x400>;
+                       interrupts-extended = <&intc 0 134 0>, <&intc 0 140 0>,
+                               <&spmi_bus 0 0x9 0 0>;
+                       interrupt-names = "core_irq", "async_irq", "pmic_id_irq";
+
+                       vddcx-supply = <&pm8841_s2>;
+                       v3p3-supply = <&pm8941_l24>;
+                       v1p8-supply = <&pm8941_l6>;
+
+                       dr_mode = "otg";
+                       qcom,phy-init-sequence = <0x63 0x81 0xfffffff>;
+                       qcom,otg-control = <1>;
+                       qcom,phy-num = <0>;
+
+                       resets = <&gcc GCC_USB2A_PHY_BCR>, <&gcc GCC_USB_HS_BCR>;
+                       reset-names = "phy", "link";
+
+                       clocks = <&gcc GCC_XO_CLK>, <&gcc GCC_USB_HS_SYSTEM_CLK>,
+                               <&gcc GCC_USB_HS_AHB_CLK>;
+                       clock-names = "phy", "core", "iface";
+
+                       status = "disabled";
+               };
+
+               usb@f9a55000 {
+                       compatible = "qcom,ci-hdrc";
+                       reg = <0xf9a55000 0x400>;
+                       dr_mode = "otg";
+                       interrupts = <0 134 0>, <0 140 0>;
+                       interrupt-names = "core_irq", "async_irq";
+                       usb-phy = <&usb1_phy>;
+
+                       status = "disabled";
+               };
        };
 
        smd {
                compatible = "qcom,smd";
 
+               adsp {
+                       interrupts = <0 156 IRQ_TYPE_EDGE_RISING>;
+
+                       qcom,ipc = <&apcs 8 8>;
+                       qcom,smd-edge = <1>;
+               };
+
                modem {
                        interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;