ARM: msm: Add support for APQ8074 Dragonboard
Subsystems (5)
PATCH v6 2/4 ARM: msm: Add support for APQ8074 Dragonboard
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.
--- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 +++++ arch/arm/boot/dts/qcom-msm8974.dtsi | 33 ++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 11 ++++++++- arch/arm/mach-msm/board-dt.c | 9 +++++++ 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi
arch/arm/boot/dts/Makefile +2 -1
@@ -102,7 +102,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 \ + qcom-apq8074-dragonboard.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts new file +6 -0
@@ -0,0 +1,6 @@ +#include "qcom-msm8974.dtsi" + +/ { + model = "Qualcomm APQ8074 Dragonboard"; + compatible = "qcom,apq8074-dragonboard", "qcom,apq8074"; +};
arch/arm/boot/dts/qcom-msm8974.dtsi new file +33 -0
@@ -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 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 +10 -1
@@ -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
arch/arm/mach-msm/board-dt.c +9 -0
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {NULL }; +static const char *const apq8074_dt_match[]__initconst = { +"qcom,apq8074-dragonboard" , +NULL +}; +DT_MACHINE_START (MSM_DT ,"Qualcomm MSM (Flattened Device Tree)" ) .smp =smp_ops (msm_smp_ops), .dt_compat = msm_dt_match, MACHINE_END + +DT_MACHINE_START (APQ_DT ,"Qualcomm MSM (Flattened Device Tree)" ) + .dt_compat = apq8074_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
Quoted 6 lines · Rohit Vaswani
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 <[email protected]>---
Quoted 8 lines
arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 +++++ arch/arm/boot/dts/qcom-msm8974.dtsi | 33 ++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 11 ++++++++- arch/arm/mach-msm/board-dt.c | 9 +++++++ 5 files changed, 60 insertions(+), 2 deletions(-)create mode 100644
arch/arm/boot/dts/qcom-apq8074-dragonboard.dtscreate mode 100644arch/arm/boot/dts/qcom-msm8974.dtsi
- 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 6 lines · Rohit Vaswani
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 <[email protected]>---
Do you mind putting some history in the commentary part of your patches, especially, like this one, when you make it to v6. Just a brief description of what you've changed makes it a lot easier for reviewers to determine if their concern has been addressed, and what else might have changed.
This missed yesterday's pull request, so I'll probably make another one to include this.
David
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
cover APQ8074 updates
In reply to Rohit VaswaniThis patchset simplifies the ARCH_MSM_DT config and adds some more nodes for devices that have drivers merged in the upstream kernel.
Stephen Boyd (3):
ARM: msm: Simplify ARCH_MSM_DT config
ARM: dts: MSM8974: Add restart node
ARM: dts: MSM8974: Add MMIO architected timer node
arch/arm/boot/dts/qcom-msm8974.dtsi | 64 +++++++++++++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 6 ++-- 2 files changed, 68 insertions(+), 2 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/3 ARM: msm: Simplify ARCH_MSM_DT config
This doesn't need to be a def_bool y. Instead we can have every DT supported platform select ARCH_MSM_DT and we achieve the same thing with less chance of conflicts.
--- arch/arm/mach-msm/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-msm/Kconfig +4 -2
@@ -44,6 +44,7 @@ endchoice config ARCH_MSM8X60 bool "MSM8X60" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select GPIO_MSM_V2
@@ -52,6 +53,7 @@ config ARCH_MSM8X60 config ARCH_MSM8960 bool "MSM8960" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_SMP
@@ -60,6 +62,7 @@ config ARCH_MSM8960 config ARCH_MSM8974 bool "MSM8974" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_ARM_ARCH_TIMER
@@ -68,8 +71,7 @@ config ARCH_MSM8974 select USE_OF config ARCH_MSM_DT - def_bool y - depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) + bool select SPARSE_IRQ select USE_OF
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 ARM: dts: MSM8974: Add restart node
In reply to Stephen BoydAdd the restart node so we can reboot the device.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +5 -0
@@ -30,4 +30,9 @@ clock-frequency = <19200000>; }; }; + + restart at fc4ab000 { + compatible = "qcom,pshold"; + reg = <0xfc4ab000 0x4>; + }; };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 ARM: dts: MSM8974: Add MMIO architected timer node
In reply to Stephen BoydAdd the mmio architected timer node.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +59 -0
@@ -31,6 +31,65 @@ }; }; + timer at f9020000 { + #address-cells = <1>; + #size-cells = <1>; + ranges; + compatible = "arm,armv7-timer-mem"; + reg = <0xf9020000 0x1000>; + clock-frequency = <19200000>; + + frame at f9021000 { + frame-number = <0>; + interrupts = <0 8 0x4>, + <0 7 0x4>; + reg = <0xf9021000 0x1000>, + <0xf9022000 0x1000>; + }; + + frame at f9023000 { + frame-number = <1>; + interrupts = <0 9 0x4>; + reg = <0xf9023000 0x1000>; + status = "disabled"; + }; + + frame at f9024000 { + frame-number = <2>; + interrupts = <0 10 0x4>; + reg = <0xf9024000 0x1000>; + status = "disabled"; + }; + + frame at f9025000 { + frame-number = <3>; + interrupts = <0 11 0x4>; + reg = <0xf9025000 0x1000>; + status = "disabled"; + }; + + frame at f9026000 { + frame-number = <4>; + interrupts = <0 12 0x4>; + reg = <0xf9026000 0x1000>; + status = "disabled"; + }; + + frame at f9027000 { + frame-number = <5>; + interrupts = <0 13 0x4>; + reg = <0xf9027000 0x1000>; + status = "disabled"; + }; + + frame at f9028000 { + frame-number = <6>; + interrupts = <0 14 0x4>; + reg = <0xf9028000 0x1000>; + status = "disabled"; + }; + }; + restart at fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
v2 cover APQ8074 updates
In reply to Rohit VaswaniThis patchset simplifies the ARCH_MSM_DT config and adds some more nodes for devices that have drivers merged in the upstream kernel.
Changes since v1:
* Moved nodes into soc node
* Enabled restart driver in defconfig
Stephen Boyd (4):
ARM: msm: Simplify ARCH_MSM_DT config
ARM: dts: MSM8974: Add restart node
ARM: dts: MSM8974: Add MMIO architected timer node
ARM: msm_defconfig: Enable restart driver
arch/arm/boot/dts/qcom-msm8974.dtsi | 64 +++++++++++++++++++++++++++++++++++++ arch/arm/configs/msm_defconfig | 2 ++ arch/arm/mach-msm/Kconfig | 6 ++-- 3 files changed, 70 insertions(+), 2 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/4 ARM: msm: Simplify ARCH_MSM_DT config
This doesn't need to be a def_bool y. Instead we can have every DT supported platform select ARCH_MSM_DT and we achieve the same thing with less chance of conflicts.
--- arch/arm/mach-msm/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-msm/Kconfig +4 -2
@@ -44,6 +44,7 @@ endchoice config ARCH_MSM8X60 bool "MSM8X60" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select GPIO_MSM_V2
@@ -52,6 +53,7 @@ config ARCH_MSM8X60 config ARCH_MSM8960 bool "MSM8960" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_SMP
@@ -60,6 +62,7 @@ config ARCH_MSM8960 config ARCH_MSM8974 bool "MSM8974" + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_ARM_ARCH_TIMER
@@ -68,8 +71,7 @@ config ARCH_MSM8974 select USE_OF config ARCH_MSM_DT - def_bool y - depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) + bool select SPARSE_IRQ select USE_OF
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/4 ARM: dts: MSM8974: Add restart node
In reply to Stephen BoydAdd the restart node so we can reboot the device.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +5 -0
@@ -29,5 +29,10 @@ <1 1 0xf08>; clock-frequency = <19200000>; }; + + restart at fc4ab000 { + compatible = "qcom,pshold"; + reg = <0xfc4ab000 0x4>; + }; }; };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 3/4 ARM: dts: MSM8974: Add MMIO architected timer node
In reply to Stephen BoydAdd the mmio architected timer node.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +59 -0
@@ -30,6 +30,65 @@ clock-frequency = <19200000>; }; + timer at f9020000 { + #address-cells = <1>; + #size-cells = <1>; + ranges; + compatible = "arm,armv7-timer-mem"; + reg = <0xf9020000 0x1000>; + clock-frequency = <19200000>; + + frame at f9021000 { + frame-number = <0>; + interrupts = <0 8 0x4>, + <0 7 0x4>; + reg = <0xf9021000 0x1000>, + <0xf9022000 0x1000>; + }; + + frame at f9023000 { + frame-number = <1>; + interrupts = <0 9 0x4>; + reg = <0xf9023000 0x1000>; + status = "disabled"; + }; + + frame at f9024000 { + frame-number = <2>; + interrupts = <0 10 0x4>; + reg = <0xf9024000 0x1000>; + status = "disabled"; + }; + + frame at f9025000 { + frame-number = <3>; + interrupts = <0 11 0x4>; + reg = <0xf9025000 0x1000>; + status = "disabled"; + }; + + frame at f9026000 { + frame-number = <4>; + interrupts = <0 12 0x4>; + reg = <0xf9026000 0x1000>; + status = "disabled"; + }; + + frame at f9027000 { + frame-number = <5>; + interrupts = <0 13 0x4>; + reg = <0xf9027000 0x1000>; + status = "disabled"; + }; + + frame at f9028000 { + frame-number = <6>; + interrupts = <0 14 0x4>; + reg = <0xf9028000 0x1000>; + status = "disabled"; + }; + }; + restart at fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 4/4 ARM: msm_defconfig: Enable restart driver
In reply to Stephen Boyd--- arch/arm/configs/msm_defconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/configs/msm_defconfig +2 -0
@@ -89,6 +89,8 @@ CONFIG_SSBI=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Hey Rohit-
Quoted 20 lines · Rohit Vaswani
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 <[email protected]>--- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 +++++ arch/arm/boot/dts/qcom-msm8974.dtsi | 33 ++++++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 11 ++++++++- arch/arm/mach-msm/board-dt.c | 9 +++++++ 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsiarch/arm/boot/dts/Makefile +0
-0
arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 106
Quoted 6 lines
arch/arm/boot/dts/Makefile +2
-1@@ -102,7 +102,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 \ + qcom-apq8074-dragonboard.dtb
For what it's worth, this hunk conflicts with Kumar's qcom- prefix stuff that's already been sent up. Perhaps it's time to refresh ontop?
Josh
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation