Re-organize DEBUG_UART for MSM and add support for MSM8974
Subsystems (5)
cover Re-organize DEBUG_UART for MSM and add support for MSM8974
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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/4 ARM: debug: Create CONFIG_DEBUG_MSM_UART and re-organize the selects for MSM
Create the hidden config DEBUG_MSM_UART and clean-up the default selection for CONFIG_DEBUG_LL_INCLUDE.
--- arch/arm/Kconfig.debug | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
arch/arm/Kconfig.debug +10 -5
@@ -318,6 +318,7 @@ choice config DEBUG_MSM_UART1 bool "Kernel low-level debugging messages via MSM UART1" depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 + select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct their output to the first serial port on MSM devices.
@@ -325,6 +326,7 @@ choice config DEBUG_MSM_UART2 bool "Kernel low-level debugging messages via MSM UART2" depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 + select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct their output to the second serial port on MSM devices.
@@ -332,6 +334,7 @@ choice config DEBUG_MSM_UART3 bool "Kernel low-level debugging messages via MSM UART3" depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 + select DEBUG_MSM_UART help Say Y here if you want the debug print routines to direct their output to the third serial port on MSM devices.
@@ -340,6 +343,7 @@ choice bool "Kernel low-level debugging messages via MSM 8660 UART" depends on ARCH_MSM8X60 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 8660 devices.
@@ -348,6 +352,7 @@ choice bool "Kernel low-level debugging messages via MSM 8960 UART" depends on ARCH_MSM8960 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 8960 devices.
@@ -880,6 +885,10 @@ config DEBUG_STI_UART bool depends on ARCH_STI +config DEBUG_MSM_UART + bool + depends on ARCH_MSM + config DEBUG_LL_INCLUDE string default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
@@ -895,11 +904,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX53_UART ||\ DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART - default "debug/msm.S" if DEBUG_MSM_UART1 || \ - DEBUG_MSM_UART2 || \ - DEBUG_MSM_UART3 || \ - DEBUG_MSM8660_UART || \ - DEBUG_MSM8960_UART + default "debug/msm.S" if DEBUG_MSM_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 default "debug/sti.S" if DEBUG_STI_UART
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 1/4] ARM: debug: Create CONFIG_DEBUG_MSM_UART and re-organize the selects for MSM
Quoted 4 lines · Rohit Vaswani
Create the hidden config
DEBUG_MSM_UARTand clean-up the default selection forCONFIG_DEBUG_LL_INCLUDE.Signed-off-by Rohit Vaswani <[email protected]>
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
PATCH v4 2/4 ARM: msm: Add support for APQ8074 Dragonboard
In reply to Rohit VaswaniThis 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 | 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
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 +35 -0
@@ -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 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 +13 -0
@@ -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
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
Re: [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard
Hi Rohit,
Quoted 35 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 | 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.dtsiarch/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 +0
-0
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts line 1
Quoted 1 line
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts new file +1
-0@@ -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
Re: [PATCHv4 2/4] ARM: msm: Add support for APQ8074 Dragonboard
Quoted 34 lines · Ivan T. Ivanov
Hi Rohit,
Quoted 31 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 | 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.dtscreate mode 100644arch/arm/boot/dts/qcom-msm8974.dtsiarch/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 +0
-0
Quoted 8 lines
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts line 1
Quoted 5 lines
index 0000000..bb6f3c4
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts new file +1
-0@@ -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.
Quoted 8 lines
Thanks,
Ivan
Thanks,
Rohit Vaswani
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/4 ARM: debug: msm: Add DEBUG_LL support for ARCH_MSM8974
In reply to Rohit VaswaniAdd debug uart support for MSM8974. This patch adds a Kconfig entry and the base address for the debug uart.
--- arch/arm/Kconfig.debug | 9 +++++++++ arch/arm/include/debug/msm.S | 5 +++++ 2 files changed, 14 insertions(+)
arch/arm/Kconfig.debug +9 -0
@@ -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. + config DEBUG_MVEBU_UART bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" depends on ARCH_MVEBU
arch/arm/include/debug/msm.S +5 -0
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/4] ARM: debug: msm: Add DEBUG_LL support for ARCH_MSM8974
Quoted 8 lines · Rohit Vaswani
Add debug uart support for MSM8974. This patch adds a
Kconfigentry and the base address for the debug uart.Signed-off-by Rohit Vaswani <[email protected]>---
arch/arm/Kconfig.debug| 9 +++++++++arch/arm/include/debug/msm.S| 5 +++++2 files changed, 14 insertions(+)
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
PATCH 4/4 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
In reply to Rohit VaswaniThis patch enables MSM8974 build support.
--- arch/arm/configs/msm_defconfig | 1 + 1 file changed, 1 insertion(+)
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