ARM: msm: Add support for MSM8974 SoC

Add support for the Snapdragon 800 MSM8974 SoC, used on the Dragonboard
and others. Board support added in separate patch.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Acked-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
[olof: split off SoC support in separate patch]
Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 43 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
new file mode 100644
index 000000000000..2ebb4f09a9b6
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -0,0 +1,33 @@
+/dts-v1/;
+
+#include "skeleton.dtsi"
+
+/ {
+        model = "Qualcomm MSM8974";
+        compatible = "qcom,msm8974";
+        interrupt-parent = <&intc>;
+
+        soc: soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                compatible = "simple-bus";
+
+                intc: interrupt-controller@f9000000 {
+                        compatible = "qcom,msm-qgic2";
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        reg = <0xf9000000 0x1000>,
+                              <0xf9002000 0x1000>;
+                };
+
+                timer {
+                        compatible = "arm,armv7-timer";
+                        interrupts = <1 2 0xf08>,
+                                     <1 3 0xf08>,
+                                     <1 4 0xf08>,
+                                     <1 1 0xf08>;
+                        clock-frequency = <19200000>;
+                };
+        };
+};
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c2865874..5e5782d5af3d 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -58,9 +58,18 @@ config ARCH_MSM8960
         select GPIO_MSM_V2
         select MSM_SCM if SMP
 
+config ARCH_MSM8974
+        bool "MSM8974"
+        select ARM_GIC
+        select CPU_V7
+        select HAVE_ARM_ARCH_TIMER
+        select HAVE_SMP
+        select MSM_SCM if SMP
+        select USE_OF
+
 config ARCH_MSM_DT
         def_bool y
-        depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+        depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
         select SPARSE_IRQ
         select USE_OF