[PATCHv3 1/2] ARM: msm: Add support for APQ8074 Dragonboard
From: Josh Cartwright <hidden>
Date: 2013-09-06 19:53:31
Also in:
linux-arm-msm, linux-devicetree, lkml
On Fri, Sep 06, 2013 at 12:32:22PM -0700, Rohit Vaswani wrote:
This patch adds basic board support for APQ8074 Dragonboard which belongs to the Snapdragon 800 family. For now, just support a basic machine with device tree. Signed-off-by: Rohit Vaswani <redacted> ---
[..]
quoted hunk ↗ jump to hunk
index 0000000..5b7b6a0--- /dev/null +++ b/arch/arm/boot/dts/apq8074-dragonboard.dts@@ -0,0 +1,6 @@ +/include/ "msm8974.dtsi" + +/ { + model = "Qualcomm APQ8074 Dragonboard"; + compatible = "qcom,apq8074-dragonboard", "qcom,apq8074"; +};diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi new file mode 100644 index 0000000..f04b643 --- /dev/null +++ b/arch/arm/boot/dts/msm8974.dtsi@@ -0,0 +1,35 @@ +/dts-v1/; + +/include/ "skeleton.dtsi" + +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + soc: soc { }; +}; + +&soc {
Breaking these up seems a little odd to me, but okay.
quoted hunk ↗ jump to hunk
+ #address-cells = <1>; + #size-cells = <1>; + ranges; + compatible = "simple-bus"; + + intc: interrupt-controller at 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 905efc8..499e8fe 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig
[..]
+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 || ARCH_MSM8974) +
Selecting _only_ ARCH_MSM8974 with these changes breaks the build with:
scripts/kconfig/conf --silentoldconfig Kconfig
#
# configuration written to .config
#
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
CC arch/arm/kernel/asm-offsets.s
GEN include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CC init/main.o
In file included from arch/arm/include/asm/irq.h:7:0,
from arch/arm/include/asm/hardirq.h:6,
from include/linux/hardirq.h:8,
from include/linux/ftrace_event.h:7,
from include/trace/syscall.h:6,
from include/linux/syscalls.h:79,
from init/main.c:18:
arch/arm/mach-msm/include/mach/irqs.h:35:2: error: #error "Unknown architecture specification"
#error "Unknown architecture specification"
^
arch/arm/mach-msm/include/mach/irqs.h:38:18: error: 'NR_MSM_IRQS' undeclared here (not in a function)
#define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
extern struct irq_desc irq_desc[NR_IRQS];
^
arch/arm/mach-msm/include/mach/irqs.h:38:32: error: 'NR_GPIO_IRQS' undeclared here (not in a function)
#define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
extern struct irq_desc irq_desc[NR_IRQS];
^
arch/arm/mach-msm/include/mach/irqs.h:38:47: error: 'NR_BOARD_IRQS' undeclared here (not in a function)
#define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
extern struct irq_desc irq_desc[NR_IRQS];
^
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2
Josh
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation