Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755152Ab3IYTtQ (ORCPT ); Wed, 25 Sep 2013 15:49:16 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:58735 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754677Ab3IYTtN convert rfc822-to-8bit (ORCPT ); Wed, 25 Sep 2013 15:49:13 -0400 Subject: Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset=us-ascii From: Kumar Gala In-Reply-To: <1379992406-3541-2-git-send-email-rvaswani@codeaurora.org> Date: Wed, 25 Sep 2013 14:49:10 -0500 Cc: David Brown , Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , Daniel Walker , Bryan Huntsman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: <4E7868D6-56CB-4AF8-8EBF-069966899C23@codeaurora.org> References: <1379992406-3541-1-git-send-email-rvaswani@codeaurora.org> <1379992406-3541-2-git-send-email-rvaswani@codeaurora.org> To: Rohit Vaswani X-Mailer: Apple Mail (2.1283) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6263 Lines: 199 On Sep 23, 2013, at 10:13 PM, 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 > --- > arch/arm/Kconfig.debug | 9 +++++++ > arch/arm/boot/dts/Makefile | 3 ++- > arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 +++++ > arch/arm/boot/dts/qcom-msm8974.dtsi | 35 ++++++++++++++++++++++++++ > arch/arm/include/debug/msm.S | 5 ++++ > arch/arm/mach-msm/Kconfig | 13 ++++++++++ > arch/arm/mach-msm/board-dt.c | 9 +++++++ > 7 files changed, 79 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts > create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index e18a6fc..959b2c7 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -357,6 +357,15 @@ choice > Say Y here if you want the debug print routines to direct > their output to the serial port on MSM 8960 devices. > > + config DEBUG_MSM8974_UART > + bool "Kernel low-level debugging messages via MSM 8974 UART" > + depends on ARCH_MSM8974 > + select MSM_HAS_DEBUG_UART_HS > + select DEBUG_MSM_UART > + help > + Say Y here if you want the debug print routines to direct > + their output to the serial port on MSM 8974 devices. > + A little surprised you didn't pull this and the ARCH_MSM8974 into its own patch outside of this patch being board support. > config DEBUG_MVEBU_UART > bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" > depends on ARCH_MVEBU > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 000cf76..e71a3ec 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -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 \ > diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts > new file mode 100644 > index 0000000..bb6f3c4 > --- /dev/null > +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts > @@ -0,0 +1,6 @@ > +/include/ "qcom-msm8974.dtsi" > + > +/ { > + model = "Qualcomm APQ8074 Dragonboard"; > + compatible = "qcom,apq8074-dragonboard", "qcom,apq8074"; > +}; > diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi > new file mode 100644 > index 0000000..f04b643 > --- /dev/null > +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi > @@ -0,0 +1,35 @@ > +/dts-v1/; > + > +/include/ "skeleton.dtsi" > + > +/ { > + model = "Qualcomm MSM8974"; > + compatible = "qcom,msm8974"; > + interrupt-parent = <&intc>; > + > + soc: soc { }; We should have a unit address here: soc: soc@FOOBAR { also, split out the curly braces so any future patches do have to muck with that. }; > +}; > + > +&soc { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + compatible = "simple-bus"; > + > + 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>, > + <1 4 0xf08>, > + <1 1 0xf08>; > + clock-frequency = <19200000>; > + }; > +}; > diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S > index 9166e1b..9d653d4 100644 > --- a/arch/arm/include/debug/msm.S > +++ b/arch/arm/include/debug/msm.S > @@ -46,6 +46,11 @@ > #define MSM_DEBUG_UART_PHYS 0x16440000 > #endif > > +#ifdef CONFIG_DEBUG_MSM8974_UART > +#define MSM_DEBUG_UART_BASE 0xFA71E000 > +#define MSM_DEBUG_UART_PHYS 0xF991E000 > +#endif > + > .macro addruart, rp, rv, tmp > #ifdef MSM_DEBUG_UART_PHYS > ldr \rp, =MSM_DEBUG_UART_PHYS > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > index 2586c28..086bcb9 100644 > --- a/arch/arm/mach-msm/Kconfig > +++ b/arch/arm/mach-msm/Kconfig > @@ -64,6 +64,19 @@ config ARCH_MSM_DT > select SPARSE_IRQ > 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 > > diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c > index 266a280..5211e80 100644 > --- a/arch/arm/mach-msm/board-dt.c > +++ b/arch/arm/mach-msm/board-dt.c > @@ -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 > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/