ARM: msm: Add support for MSM8974
Subsystems (5)
PATCH 1/2 ARM: msm: Add support for MSM8974
This patch adds basic board support for MSM8974.
--- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/msm8974.dts | 23 +++++++++++++++++++++++ arch/arm/mach-msm/Kconfig | 31 +++++++++++++++++++++++++++---- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dt-8974.c | 25 +++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 arch/arm/boot/dts/msm8974.dts create mode 100644 arch/arm/mach-msm/board-dt-8974.c
arch/arm/boot/dts/Makefile +2 -1
@@ -90,7 +90,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.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-rd.dtb \
arch/arm/boot/dts/msm8974.dts new file +23 -0
@@ -0,0 +1,23 @@ +/dts-v1/; + +/include/ "skeleton.dtsi" + +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + 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 0 1 3 0>; + clock-frequency = <19200000>; + }; +};
arch/arm/mach-msm/Kconfig +27 -4
@@ -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"
@@ -46,7 +46,6 @@ config ARCH_MSM8X60 bool "MSM8X60" select ARM_GIC select CPU_V7 - select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP select USE_OF
@@ -60,14 +59,37 @@ config ARCH_MSM8960 select MSM_SCM if SMP select USE_OF +config ARCH_MSM8974 + bool "MSM8974" + select ARCH_MSM_KRAITMP + select ARM_GIC + select CPU_V7 + select HAVE_ARM_ARCH_TIMER + select USE_OF + select MSM_SCM if SMP + +config ARCH_MSM_DT + def_bool y + depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) + config MSM_HAS_DEBUG_UART_HS bool config MSM_SOC_REV_A bool +config ARCH_MSM_KRAIT + bool + select ARM_L1_CACHE_SHIFT_6 + +config ARCH_MSM_KRAITMP + select ARCH_MSM_KRAIT + select HAVE_SMP + bool + config ARCH_MSM_ARM11 bool + config ARCH_MSM_SCORPION bool
@@ -75,6 +97,7 @@ config MSM_VIC bool menu "Qualcomm MSM Board Type" + depends on !ARCH_MSM_DT config MACH_HALIBUT depends on ARCH_MSM
@@ -121,7 +144,7 @@ config MSM_SMD bool config MSM_GPIOMUX - depends on !(ARCH_MSM8X60 || ARCH_MSM8960) + depends on !ARCH_MSM_DT bool "MSM V1 TLMM GPIOMUX architecture" help Support for MSM V1 TLMM GPIOMUX architecture.
arch/arm/mach-msm/Makefile +1 -0
@@ -29,5 +29,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 +25 -0
@@ -0,0 +1,25 @@ +/* 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/init.h> +#include <linux/irqchip.h> +#include <linux/of_platform.h> +#include <asm/mach/arch.h> + +static const char *const msm8974_dt_match[]__initconst = { +"qcom,msm8974" , +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 2/2 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
This patch enables MSM8974 build support.
--- arch/arm/configs/msm_defconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
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
Quoted 18 lines · Rohit Vaswani
arch/arm/boot/dts/msm8974.dts new file +12
-0@@ -0,0 +1,23 @@ +/dts-v1/; + +/include/ "skeleton.dtsi" + +/ { + model = "Qualcomm MSM8974"; + compatible = "qcom,msm8974"; + interrupt-parent = <&intc>; + + intc: interrupt-controller@f9000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller;
arch/arm/boot/dts/msm8974.dts line 22
Quoted 10 lines
arch/arm/boot/dts/msm8974.dts new file +10
-0+ #interrupt-cells = <3>; + reg = < 0xf9000000 0x1000 >, + < 0xf9002000 0x1000 >; + }; + + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 2 0 1 3 0>; + clock-frequency = <19200000>; + };
Please specify all the interrupts similar to how the binding says to.
<1 2 0>, <1 3 0>, <1 4 0>, <1 5 0>;
Also, add irq flags?
arch/arm/mach-msm/Kconfig config ARCH_MSM8X60 · line 51
Quoted 13 lines
arch/arm/boot/dts/msm8974.dts new file +1
-0+};arch/arm/mach-msm/Kconfig +0
-1@@ -46,7 +46,6 @@ config ARCH_MSM8X60 bool "MSM8X60" select ARM_GIC select CPU_V7 - select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP select USE_OF
Looks unrelated. Can you drop this?
arch/arm/mach-msm/Kconfig config ARCH_MSM8960 · line 69
Quoted 12 lines
arch/arm/mach-msm/Kconfig +8
-0@@ -60,14 +59,37 @@ config ARCH_MSM8960 select MSM_SCM if SMP select USE_OF +config ARCH_MSM8974 + bool "MSM8974" + select ARCH_MSM_KRAITMP + select ARM_GIC + select CPU_V7 + select HAVE_ARM_ARCH_TIMER + select USE_OF + select MSM_SCM if SMP
Please sort these selects alphabetically.
Quoted 4 lines
arch/arm/mach-msm/Kconfig +4
-0+ +config ARCH_MSM_DT + def_bool y + depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
arch/arm/mach-msm/Kconfig config ARCH_MSM8960 · line 83
Quoted 10 lines
arch/arm/mach-msm/Kconfig +4
-0+ config MSM_HAS_DEBUG_UART_HS bool config MSM_SOC_REV_A bool +config ARCH_MSM_KRAIT + bool + select ARM_L1_CACHE_SHIFT_6
This is the default for CPU_V7 and so is unnnecessary.
arch/arm/mach-msm/Kconfig config ARCH_MSM8960 · line 88
Quoted 5 lines
arch/arm/mach-msm/Kconfig +5
-0+ +config ARCH_MSM_KRAITMP + select ARCH_MSM_KRAIT + select HAVE_SMP + bool
And this is not doing much besides enabling SMP. So I would just drop this for now or merge it with the 8974 kconfig.
arch/arm/mach-msm/board-dt-8974.c line 15
Quoted 3 lines
arch/arm/mach-msm/board-dt-8974.c +2
-0+#include <linux/irqchip.h> +#include <linux/of_platform.h>
These two aren't needed?
Quoted 10 lines
arch/arm/mach-msm/board-dt-8974.c +10
-0+#include <asm/mach/arch.h> + +static const char *const msm8974_dt_match[]__initconst = { +"qcom,msm8974" , +NULL +}; + +DT_MACHINE_START (MSM8974_DT ,"Qualcomm MSM (Flattened Device Tree)" ) + .dt_compat = msm8974_dt_match, +MACHINE_END
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation