* [PATCHv2 1/2] ARM: msm: Add support for MSM8974
@ 2013-06-22 2:24 Rohit Vaswani
2013-06-22 2:24 ` [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 Rohit Vaswani
0 siblings, 1 reply; 5+ messages in thread
From: Rohit Vaswani @ 2013-06-22 2:24 UTC (permalink / raw)
To: Russell King, David Brown, Daniel Walker, Bryan Huntsman
Cc: Rohit Vaswani, linux-kernel, linux-arm-msm
This patch adds basic board support for MSM8974 which
belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/msm8974.dts | 24 ++++++++++++++++++++++++
arch/arm/mach-msm/Kconfig | 21 ++++++++++++++++++---
arch/arm/mach-msm/Makefile | 1 +
arch/arm/mach-msm/board-dt-8974.c | 23 +++++++++++++++++++++++
5 files changed, 68 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/boot/dts/msm8974.dts
create mode 100644 arch/arm/mach-msm/board-dt-8974.c
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b9f7121..7728cfe 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/msm8974.dts b/arch/arm/boot/dts/msm8974.dts
new file mode 100644
index 0000000..8ed71ef
--- /dev/null
+++ b/arch/arm/boot/dts/msm8974.dts
@@ -0,0 +1,24 @@
+/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 0xf08>,
+ <1 3 0xf08>;
+ clock-frequency = <19200000>;
+ };
+};
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 614e41e..343675b 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
@@ -121,7 +136,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.
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index d257ff4..80e3b15 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/board-dt-8974.c b/arch/arm/mach-msm/board-dt-8974.c
new file mode 100644
index 0000000..d7f84f2
--- /dev/null
+++ b/arch/arm/mach-msm/board-dt-8974.c
@@ -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",
+ NULL
+};
+
+DT_MACHINE_START(MSM8974_DT, "Qualcomm MSM (Flattened Device Tree)")
+ .dt_compat = msm8974_dt_match,
+MACHINE_END
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
2013-06-22 2:24 [PATCHv2 1/2] ARM: msm: Add support for MSM8974 Rohit Vaswani
@ 2013-06-22 2:24 ` Rohit Vaswani
0 siblings, 0 replies; 5+ messages in thread
From: Rohit Vaswani @ 2013-06-22 2:24 UTC (permalink / raw)
To: Russell King, David Brown, Daniel Walker, Bryan Huntsman
Cc: Rohit Vaswani, linux-kernel, linux-arm-msm
This patch enables MSM8974 build support.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
arch/arm/configs/msm_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 690b5f9..0ed32e5 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
2013-09-06 0:04 [PATCHv2 1/2] ARM: msm: Add support for MSM8974 Dragonboard Rohit Vaswani
@ 2013-09-06 0:04 ` Rohit Vaswani
2013-09-06 12:56 ` Christopher Covington
0 siblings, 1 reply; 5+ messages in thread
From: Rohit Vaswani @ 2013-09-06 0:04 UTC (permalink / raw)
To: David Brown
Cc: Rohit Vaswani, Stephen Boyd, Russell King, Arnd Bergmann,
linux-arm-kernel, linux-arm-msm
This patch enables MSM8974 build support.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
arch/arm/configs/msm_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 690b5f9..0ed32e5 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
2013-09-06 0:04 ` [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 Rohit Vaswani
@ 2013-09-06 12:56 ` Christopher Covington
2013-09-06 16:29 ` Stephen Boyd
0 siblings, 1 reply; 5+ messages in thread
From: Christopher Covington @ 2013-09-06 12:56 UTC (permalink / raw)
To: Rohit Vaswani
Cc: David Brown, Russell King, Arnd Bergmann, linux-arm-msm,
Stephen Boyd, linux-arm-kernel
Hi Rohit,
On 09/05/2013 08:04 PM, Rohit Vaswani wrote:
> This patch enables MSM8974 build support.
>
> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
> ---
> arch/arm/configs/msm_defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
> index 690b5f9..0ed32e5 100644
> --- a/arch/arm/configs/msm_defconfig
> +++ b/arch/arm/configs/msm_defconfig
> @@ -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
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by the Linux Foundation.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
2013-09-06 12:56 ` Christopher Covington
@ 2013-09-06 16:29 ` Stephen Boyd
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Boyd @ 2013-09-06 16:29 UTC (permalink / raw)
To: Christopher Covington
Cc: Rohit Vaswani, David Brown, Russell King, Arnd Bergmann,
linux-arm-msm, linux-arm-kernel
On 09/06, Christopher Covington wrote:
> Hi Rohit,
>
> On 09/05/2013 08:04 PM, Rohit Vaswani wrote:
> > This patch enables MSM8974 build support.
> >
> > Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
> > ---
> > arch/arm/configs/msm_defconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
> > index 690b5f9..0ed32e5 100644
> > --- a/arch/arm/configs/msm_defconfig
> > +++ b/arch/arm/configs/msm_defconfig
> > @@ -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)?
>
MSM is not part of multiplatform yet. We have a few more things
to do before that.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-06 16:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-22 2:24 [PATCHv2 1/2] ARM: msm: Add support for MSM8974 Rohit Vaswani
2013-06-22 2:24 ` [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 Rohit Vaswani
-- strict thread matches above, loose matches on Subject: below --
2013-09-06 0:04 [PATCHv2 1/2] ARM: msm: Add support for MSM8974 Dragonboard Rohit Vaswani
2013-09-06 0:04 ` [PATCHv2 2/2] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 Rohit Vaswani
2013-09-06 12:56 ` Christopher Covington
2013-09-06 16:29 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).