ARM: msm: Add support for MSM8974 Dragonboard
Subsystems (5)
PATCH v2 1/2 ARM: msm: Add support for MSM8974 Dragonboard
This patch adds basic board support for MSM8974 Dragonboard which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.
--- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/msm8974-db.dts | 7 +++++++ arch/arm/boot/dts/msm8974.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 20 ++++++++++++++++++-- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dt-8974.c | 23 +++++++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 arch/arm/boot/dts/msm8974-db.dts create mode 100644 arch/arm/boot/dts/msm8974.dtsi create mode 100644 arch/arm/mach-msm/board-dt-8974.c
arch/arm/boot/dts/Makefile +2 -1
@@ -103,7 +103,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-openblocks_a6.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ - msm8960-cdp.dtb + msm8960-cdp.dtb \ + msm8974-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \
arch/arm/boot/dts/msm8974-db.dts new file +7 -0
@@ -0,0 +1,7 @@ +/include/ "msm8974.dtsi" + +/ { + model = "Qualcomm MSM8974 Dragonboard"; + compatible = "qcom,msm8974-db", "qcom,msm8974"; +}; +
arch/arm/boot/dts/msm8974.dtsi new file +30 -0
@@ -0,0 +1,30 @@ +/dts-v1/; + +/include/ "skeleton.dtsi" + +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + soc: soc { }; +}; + +&soc { + 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>; + }; +};
arch/arm/mach-msm/Kconfig +18 -2
@@ -1,12 +1,12 @@ if ARCH_MSM comment "Qualcomm MSM SoC Type" - depends on (ARCH_MSM8X60 || ARCH_MSM8960) + depends on ARCH_MSM_DT choice prompt "Qualcomm MSM SoC Type" default ARCH_MSM7X00A - depends on !(ARCH_MSM8X60 || ARCH_MSM8960) + depends on !ARCH_MSM_DT config ARCH_MSM7X00A bool "MSM7x00A / MSM7x01A"
@@ -60,6 +60,19 @@ config ARCH_MSM8960 select MSM_SCM if SMP select USE_OF +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) + config MSM_HAS_DEBUG_UART_HS bool
@@ -68,6 +81,7 @@ config MSM_SOC_REV_A config ARCH_MSM_ARM11 bool + config ARCH_MSM_SCORPION bool
@@ -75,6 +89,7 @@ config MSM_VIC bool menu "Qualcomm MSM Board Type" + depends on !ARCH_MSM_DT config MACH_HALIBUT depends on ARCH_MSM
@@ -122,6 +137,7 @@ config MSM_SMD config MSM_GPIOMUX bool + depends on !ARCH_MSM_DT help Support for MSM V1 TLMM GPIOMUX architecture.
arch/arm/mach-msm/Makefile +1 -0
@@ -28,5 +28,6 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o +obj-$(CONFIG_ARCH_MSM8974) += board-dt-8974.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o
arch/arm/mach-msm/board-dt-8974.c new file +23 -0
@@ -0,0 +1,23 @@ +/* Copyright (c) 2013, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/of_platform.h> +#include <asm/mach/arch.h> + +static const char *const msm8974_dt_match[]__initconst = { +"qcom,msm8974-db" , +NULL +}; + +DT_MACHINE_START (MSM8974_DT ,"Qualcomm MSM (Flattened Device Tree)" ) + .dt_compat = msm8974_dt_match, +MACHINE_END
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/2 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
This patch enables MSM8974 build support.
--- arch/arm/configs/msm_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/msm_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/2 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
Hi Rohit,
Quoted 12 lines · Rohit Vaswani
This patch enables MSM8974 build support.
Signed-off-by Rohit Vaswani <[email protected]>--- arch/arm/configs/msm_defconfig | 1 + 1 file changed, 1 insertion(+)arch/arm/configs/msm_defconfig +0
-0
arch/arm/configs/msm_defconfig CONFIG_PARTITION_ADVANCED=y · line 26
Quoted 7 lines
arch/arm/configs/msm_defconfig +1
-0@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y
Why not turn it on in the multiplatform defconfig (multi_v7_defconfig)?
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.
PATCH v2 2/2 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
Quoted 10 lines · Christopher Covington
Hi Rohit,
Quoted 7 lines · Rohit Vaswani
This patch enables MSM8974 build support.
Signed-off-by Rohit Vaswani <[email protected]>--- arch/arm/configs/msm_defconfig | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
arch/arm/configs/msm_defconfig CONFIG_PARTITION_ADVANCED=y · line 26
Quoted 12 lines
arch/arm/configs/msm_defconfig +1
-0@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=yWhy not turn it on in the multiplatform defconfig (
multi_v7_defconfig)?
MSM is not part of multiplatform yet. We have a few more things to do before that.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 13 lines · Rohit Vaswani
This patch adds basic board support for MSM8974 Dragonboard which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.Signed-off-by Rohit Vaswani <[email protected]>---
arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/msm8974-db.dts | 7 +++++++ arch/arm/boot/dts/msm8974.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 20 ++++++++++++++++++-- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dt-8974.c | 23 +++++++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-)
Quoted 3 lines
create mode 100644
arch/arm/boot/dts/msm8974-db.dtscreate mode 100644arch/arm/boot/dts/msm8974.dtsicreate mode 100644arch/arm/mach-msm/board-dt-8974.c
As I mentioned before, its the APQ8074 Dragonboard, not MSM8974
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 18 lines · Kumar Gala
Quoted 13 lines · Rohit Vaswani
This patch adds basic board support for MSM8974 Dragonboard which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.Signed-off-by Rohit Vaswani <[email protected]>---
arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/msm8974-db.dts | 7 +++++++ arch/arm/boot/dts/msm8974.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 20 ++++++++++++++++++-- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dt-8974.c | 23 +++++++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-)Quoted 3 lines
create mode 100644
arch/arm/boot/dts/msm8974-db.dtscreate mode 100644arch/arm/boot/dts/msm8974.dtsicreate mode 100644arch/arm/mach-msm/board-dt-8974.c
Quoted 1 line
As I mentioned before, its the APQ8074 Dragonboard, not MSM8974
We are not going with the internal (mangled) naming schemes for this as the configs etc. are all aligned to MSM8974 and we will only have this 1 platform as our upstream platform.
Quoted 3 lines
- k
Thanks,
Rohit Vaswani
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 19 lines · Rohit Vaswani
Quoted 18 lines · Kumar Gala
Quoted 16 lines · Rohit Vaswani
This patch adds basic board support for MSM8974 Dragonboard which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.Signed-off-by Rohit Vaswani <[email protected]>---
arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/msm8974-db.dts | 7 +++++++ arch/arm/boot/dts/msm8974.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 20 ++++++++++++++++++-- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dt-8974.c | 23 +++++++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-)create mode 100644
arch/arm/boot/dts/msm8974-db.dtscreate mode 100644arch/arm/boot/dts/msm8974.dtsicreate mode 100644arch/arm/mach-msm/board-dt-8974.c
Quoted 3 lines
Quoted 1 line
As I mentioned before, its the APQ8074 Dragonboard, not MSM8974
We are not going with the internal (mangled) naming schemes for this as the configs etc. are all aligned to MSM8974 and we will only have this 1 platform as our upstream platform.
I'm not sure I understand your point.
We call it the DB8074 and not DB8974:
http://mydragonboard.org/db8074/
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 22 lines · Rohit Vaswani
arch/arm/boot/dts/msm8974-db.dts new file +7
-0@@ -0,0 +1,7 @@ +/include/ "msm8974.dtsi" + +/ { + model = "Qualcomm MSM8974 Dragonboard"; + compatible = "qcom,msm8974-db", "qcom,msm8974"; +}; +arch/arm/boot/dts/msm8974.dtsi new file +3
-0@@ -0,0 +1,30 @@ +/dts-v1/; + +/include/ "skeleton.dtsi"
arch/arm/boot/dts/msm8974.dtsi line 13
Quoted 10 lines
arch/arm/boot/dts/msm8974.dtsi new file +10
-0+ +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + soc: soc { }; +}; + +&soc {
We should probably have:
#address-cells = <1>;
#size-cells = <1>;
ranges;
compatible = "simple-bus"; arch/arm/boot/dts/msm8974.dtsi line 21
Quoted 8 lines
arch/arm/boot/dts/msm8974.dtsi new file +8
-0+ intc: interrupt-controller at f9000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller; + #interrupt-cells = <3>; + reg = < 0xf9000000 0x1000 >, + < 0xf9002000 0x1000 >; + }; +
Let's be consistent on white space around < >
Quoted 12 lines
arch/arm/boot/dts/msm8974.dtsi new file +9
-0+ timer { + compatible = "arm,armv7-timer"; + interrupts = <1 2 0xf08>, + <1 3 0xf08>, + <1 4 0xf08>, + <1 1 0xf08>; + clock-frequency = <19200000>; + }; +};
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 36 lines · Kumar Gala
Quoted 22 lines · Rohit Vaswani
arch/arm/boot/dts/msm8974-db.dts new file +7
-0@@ -0,0 +1,7 @@ +/include/ "msm8974.dtsi" + +/ { + model = "Qualcomm MSM8974 Dragonboard"; + compatible = "qcom,msm8974-db", "qcom,msm8974"; +}; +arch/arm/boot/dts/msm8974.dtsi new file +3
-0@@ -0,0 +1,30 @@ +/dts-v1/; + +/include/ "skeleton.dtsi"arch/arm/boot/dts/msm8974.dtsi line 13
Quoted 10 lines
arch/arm/boot/dts/msm8974.dtsi new file +10
-0+ +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + soc: soc { }; +}; + +&soc {We should probably have:
Quoted 4 lines
#address-cells = <1>;
#size-cells = <1>;
ranges;
compatible = "simple-bus";Sure. Not sure how that got left off.
Quoted 10 lines
arch/arm/boot/dts/msm8974.dtsi line 21
Quoted 9 lines
arch/arm/boot/dts/msm8974.dtsi new file +8
-0+ intc: interrupt-controller at f9000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller; + #interrupt-cells = <3>; + reg = < 0xf9000000 0x1000 >, + < 0xf9002000 0x1000 >; + }; +Let's be consistent on white space around < >
Done.
Quoted 11 lines
Quoted 9 lines
arch/arm/boot/dts/msm8974.dtsi new file +8
-0+ timer { + compatible = "arm,armv7-timer"; + interrupts = <1 2 0xf08>, + <1 3 0xf08>, + <1 4 0xf08>, + <1 1 0xf08>; + clock-frequency = <19200000>; + };
Quoted 1 line
arch/arm/boot/dts/msm8974.dtsi line 30
Quoted 1 line
arch/arm/boot/dts/msm8974.dtsi new file +1
-0+};
Thanks,
Rohit Vaswani
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation