* [PATCH 0/4]Re-organize DEBUG_UART for MSM and add support for MSM8974 @ 2013-10-03 23:05 Rohit Vaswani 2013-10-03 23:05 ` [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard Rohit Vaswani 0 siblings, 1 reply; 4+ messages in thread From: Rohit Vaswani @ 2013-10-03 23:05 UTC (permalink / raw) To: David Brown, Russell King Cc: Rohit Vaswani, Rob Herring, Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell, Daniel Walker, Bryan Huntsman, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA As a pre-cursor, this series cleans-up the DEBUG_UART configs for msm and includes patches to add basic board support for MSM8974 and debug uart support for it as well. The debug uart patches will be added to Russell's patch tracker and hence were separated from the MSM8974 patch. Rohit Vaswani (4): ARM: debug: Create CONFIG_DEBUG_MSM_UART and re-organize the selects for MSM ARM: msm: Add support for APQ8074 Dragonboard ARM: debug: msm: Add DEBUG_LL support for ARCH_MSM8974 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 arch/arm/Kconfig.debug | 24 ++++++++++++++---- 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/configs/msm_defconfig | 1 + arch/arm/include/debug/msm.S | 5 ++++ arch/arm/mach-msm/Kconfig | 13 ++++++++++ arch/arm/mach-msm/board-dt.c | 9 +++++++ 8 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi -- 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 devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard 2013-10-03 23:05 [PATCH 0/4]Re-organize DEBUG_UART for MSM and add support for MSM8974 Rohit Vaswani @ 2013-10-03 23:05 ` Rohit Vaswani [not found] ` <1380841557-2673-3-git-send-email-rvaswani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Rohit Vaswani @ 2013-10-03 23:05 UTC (permalink / raw) To: David Brown Cc: Rohit Vaswani, Rob Herring, Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell, Russell King, Daniel Walker, Bryan Huntsman, devicetree, linux-arm-kernel, linux-kernel, linux-arm-msm 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 <rvaswani@codeaurora.org> --- 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/mach-msm/Kconfig | 13 ++++++++++ arch/arm/mach-msm/board-dt.c | 9 +++++++ 5 files changed, 65 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/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 { }; +}; + +&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/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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <1380841557-2673-3-git-send-email-rvaswani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>]
* Re: [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard [not found] ` <1380841557-2673-3-git-send-email-rvaswani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> @ 2013-10-04 8:28 ` Ivan T. Ivanov 2013-10-04 8:45 ` Rohit Vaswani 0 siblings, 1 reply; 4+ messages in thread From: Ivan T. Ivanov @ 2013-10-04 8:28 UTC (permalink / raw) To: Rohit Vaswani Cc: David Brown, Rob Herring, Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell, Russell King, Daniel Walker, Bryan Huntsman, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA Hi Rohit, On Thu, 2013-10-03 at 16:05 -0700, 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 <rvaswani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> > --- > 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/mach-msm/Kconfig | 13 ++++++++++ > arch/arm/mach-msm/board-dt.c | 9 +++++++ > 5 files changed, 65 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/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" Please, could you replace /include/ by #include. This will allow us to use of #define features from C header files. Since[1] we have clocks indexes definitions shared between C code and DT files. Thanks, Ivan [1] http://www.spinics.net/lists/arm-kernel/msg276937.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard 2013-10-04 8:28 ` Ivan T. Ivanov @ 2013-10-04 8:45 ` Rohit Vaswani 0 siblings, 0 replies; 4+ messages in thread From: Rohit Vaswani @ 2013-10-04 8:45 UTC (permalink / raw) To: Ivan T. Ivanov Cc: Mark Rutland, devicetree, Russell King, Ian Campbell, Pawel Moll, Stephen Warren, linux-arm-msm, linux-kernel, Rob Herring, Bryan Huntsman, Daniel Walker, David Brown, linux-arm-kernel On 10/4/2013 1:28 AM, Ivan T. Ivanov wrote: > Hi Rohit, > > On Thu, 2013-10-03 at 16:05 -0700, 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 <rvaswani@codeaurora.org> >> --- >> 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/mach-msm/Kconfig | 13 ++++++++++ >> arch/arm/mach-msm/board-dt.c | 9 +++++++ >> 5 files changed, 65 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/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" > Please, could you replace /include/ by #include. This will allow > us to use of #define features from C header files. Since[1] we have > clocks indexes definitions shared between C code and DT files. Will do. > > Thanks, > Ivan > > [1] http://www.spinics.net/lists/arm-kernel/msg276937.html > > > Thanks, Rohit Vaswani -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-04 8:45 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-10-03 23:05 [PATCH 0/4]Re-organize DEBUG_UART for MSM and add support for MSM8974 Rohit Vaswani 2013-10-03 23:05 ` [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard Rohit Vaswani [not found] ` <1380841557-2673-3-git-send-email-rvaswani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2013-10-04 8:28 ` Ivan T. Ivanov 2013-10-04 8:45 ` Rohit Vaswani
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).