Skip to contentSkip to conversation

PATCH Superseded Rohit Vaswani 4 participants 13 messages Sep 24, 2013 – Sep 26, 2013

Subsystems (5)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

Date: Mon, 23 Sep 2013 19:51:25 -0700
Subject: [PATCH 1/3] 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
index 9762c84..e18a6fc 100644
@@ -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
#1 lore raw

PATCH v4 2/3 ARM: msm: Add support for APQ8074 Dragonboard

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.

---
 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
arch/arm/Kconfig.debug +9 -0
index e18a6fc..959b2c7 100644
@@ -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/boot/dts/Makefile +2 -1
index 000cf76..e71a3ec 100644
@@ -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
new file mode 100644
index 0000000..bb6f3c4
@@ -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
new file mode 100644
index 0000000..f04b643
@@ -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/include/debug/msm.S +5 -0
index 9166e1b..9d653d4 100644
@@ -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
arch/arm/mach-msm/Kconfig +13 -0
index 2586c28..086bcb9 100644
@@ -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
index 266a280..5211e80 100644
@@ -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
#2 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 24 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.

---

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

arch/arm/Kconfig.debug +0 -0
index e18a6fc..959b2c7 100644
@@ -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.

arch/arm/Kconfig.debug choice · line 368

Quoted 10 lines
arch/arm/Kconfig.debug +9 -0
 
+	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.

Quoted 35 lines
arch/arm/Kconfig.debug +0 -0
 	config DEBUG_MVEBU_UART
 		bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
 		depends on ARCH_MVEBU
arch/arm/boot/dts/Makefile +0 -0
index 000cf76..e71a3ec 100644
@@ -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 \

arch/arm/boot/dts/Makefile +2 -1
-	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
new file mode 100644
index 0000000..bb6f3c4
@@ -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 +0 -0
new file mode 100644
index 0000000..f04b643

arch/arm/boot/dts/qcom-msm8974.dtsi line 10

Quoted 10 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +10 -0
@@ -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 at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

	};
Quoted 94 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +25 -0
+};
+
+&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/include/debug/msm.S +5 -0
index 9166e1b..9d653d4 100644
@@ -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
arch/arm/mach-msm/Kconfig +13 -0
index 2586c28..086bcb9 100644
@@ -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 +5 -0
index 266a280..5211e80 100644
@@ -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

arch/arm/mach-msm/board-dt.c +4 -0
+
+DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.dt_compat = apq8074_dt_match,
+MACHINE_END
Signature · 7 lines
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 at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#3 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 27 lines · Kumar Gala
Quoted 25 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.

---

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

arch/arm/Kconfig.debug +0 -0
index e18a6fc..959b2c7 100644
@@ -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.
 
Quoted 10 lines

arch/arm/Kconfig.debug choice · line 368

Quoted 9 lines
arch/arm/Kconfig.debug +9 -0
+	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.

Well, its good to have this as part of initial board setup for earlyprintk.

Quoted 48 lines
Quoted 36 lines
arch/arm/Kconfig.debug +0 -0
 	config DEBUG_MVEBU_UART
 		bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
 		depends on ARCH_MVEBU
arch/arm/boot/dts/Makefile +0 -0
index 000cf76..e71a3ec 100644
@@ -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 \

arch/arm/boot/dts/Makefile +2 -1
-	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
new file mode 100644
index 0000000..bb6f3c4
@@ -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 +0 -0
new file mode 100644
index 0000000..f04b643

arch/arm/boot/dts/qcom-msm8974.dtsi line 10

Quoted 10 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +10 -0
@@ -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:

Quoted 6 lines
	  soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

	};

Im not sure I understand the reasoning behind the unit address for soc ?

Quoted 90 lines
Quoted 90 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +25 -0
+};
+
+&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/include/debug/msm.S +5 -0
index 9166e1b..9d653d4 100644
@@ -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
arch/arm/mach-msm/Kconfig +13 -0
index 2586c28..086bcb9 100644
@@ -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 +5 -0
index 266a280..5211e80 100644
@@ -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

arch/arm/mach-msm/board-dt.c +4 -0
+
+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
Quoted 4 lines
Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Thanks,
Rohit Vaswani

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
#4 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 39 lines · Rohit Vaswani
Quoted 27 lines · Kumar Gala
Quoted 25 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.

---

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

arch/arm/Kconfig.debug +0 -0
index e18a6fc..959b2c7 100644
@@ -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.
 
Quoted 10 lines

arch/arm/Kconfig.debug choice · line 368

Quoted 9 lines
arch/arm/Kconfig.debug +9 -0
+	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.

Quoted 1 line

Well, its good to have this as part of initial board setup for earlyprintk.

I agree, just figured it would have been a standalone patch and a precursor to this patch.

Quoted 47 lines
Quoted 47 lines
Quoted 35 lines
arch/arm/Kconfig.debug +0 -0
 	config DEBUG_MVEBU_UART
 		bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
 		depends on ARCH_MVEBU
arch/arm/boot/dts/Makefile +0 -0
index 000cf76..e71a3ec 100644
@@ -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 \

arch/arm/boot/dts/Makefile +2 -1
-	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
new file mode 100644
index 0000000..bb6f3c4
@@ -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 +0 -0
new file mode 100644
index 0000000..f04b643

arch/arm/boot/dts/qcom-msm8974.dtsi line 10

Quoted 10 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +10 -0
@@ -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:

Quoted 8 lines
Quoted 6 lines
	  soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

	};

Im not sure I understand the reasoning behind the unit address for soc ?

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +17 -0
+};
+
+&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 {
Quoted 8 lines
Quoted 8 lines

arch/arm/boot/dts/qcom-msm8974.dtsi line 35

Quoted 8 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +8 -0
+		compatible = "arm,armv7-timer";
+		interrupts = <1 2 0xf08>,
+			     <1 3 0xf08>,
+			     <1 4 0xf08>,
+			     <1 1 0xf08>;
+		clock-frequency = <19200000>;
+	};
+};

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#5 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 28 lines · Kumar Gala

<snip>

+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

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 +10 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+	model = "Qualcomm MSM8974";
+	compatible = "qcom,msm8974";
+	interrupt-parent = <&intc>;
+
+	soc: soc { };
Quoted 2 lines
Quoted 2 lines

We should have a unit address here:

Quoted 9 lines
Quoted 7 lines
Quoted 6 lines
	  soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

	};

Im not sure I understand the reasoning behind the unit address for soc ?

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

That still doesn't really answer anything :) - and I couldn't find any discussions about this either.
I don't see anybody in upstream adding an address to soc except sun. What is that address supposed to be for - what does it mean ? The soc is way of encapsulating meaningful blocks for the particular SoC.

Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +18 -0
+};
+
+&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";
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines

arch/arm/boot/dts/qcom-msm8974.dtsi line 35

Quoted 7 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +7 -0
+		interrupts = <1 2 0xf08>,
+			     <1 3 0xf08>,
+			     <1 4 0xf08>,
+			     <1 1 0xf08>;
+		clock-frequency = <19200000>;
+	};
+};

- k

Thanks,
Rohit Vaswani

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
#6 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 42 lines · Rohit Vaswani
Quoted 34 lines · Kumar Gala

<snip>

+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

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 +10 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+    model = "Qualcomm MSM8974";
+    compatible = "qcom,msm8974";
+    interrupt-parent = <&intc>;
+
+    soc: soc { };
Quoted 7 lines
Quoted 7 lines

We should have a unit address here:

      soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
    };

Im not sure I understand the reasoning behind the unit address for soc ?

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

Quoted 6 lines

That still doesn't really answer anything :) - and I couldn't find any discussions about this either.
I don't see anybody in upstream adding an address to soc except sun. What is that address supposed to be for - what does it mean ? The soc is way of encapsulating meaningful blocks for the particular SoC.

I see the mail from Stephen Warren for adding a check stating that

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

The soc node we have does not have a reg property ?

Quoted 31 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +18 -0
+};
+
+&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";
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines

arch/arm/boot/dts/qcom-msm8974.dtsi line 35

Quoted 7 lines
arch/arm/boot/dts/qcom-msm8974.dtsi new file +7 -0
+        interrupts = <1 2 0xf08>,
+                 <1 3 0xf08>,
+                 <1 4 0xf08>,
+                 <1 1 0xf08>;
+        clock-frequency = <19200000>;
+    };
+};

- k

Quoted 3 lines

Thanks,
Rohit Vaswani

Thanks,
Rohit Vaswani

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
#7 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 46 lines · Rohit Vaswani
Quoted 35 lines · Rohit Vaswani
Quoted 34 lines · Kumar Gala

<snip>

+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

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 +10 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+    model = "Qualcomm MSM8974";
+    compatible = "qcom,msm8974";
+    interrupt-parent = <&intc>;
+
+    soc: soc { };
Quoted 8 lines
Quoted 8 lines

We should have a unit address here:

     soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

   };
Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Im not sure I understand the reasoning behind the unit address for soc ?

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

That still doesn't really answer anything :) - and I couldn't find any discussions about this either. I don't see anybody in upstream adding an address to soc except sun.
What is that address supposed to be for - what does it mean ?
The soc is way of encapsulating meaningful blocks for the particular SoC.

I see the mail from Stephen Warren for adding a check stating that

Quoted 7 lines

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

The soc node we have does not have a reg property ?

Not 100% sure what people will decide on this. There are a number of examples on the PPC side (arch/powerpc/boot/dts) that are soc at ADDR, but they don't typically have "reg" properties at the soc level.

Let's go ahead w/o the unit address (as you have it) for now.

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#8 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 6 lines · Kumar Gala
Quoted 6 lines

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

Quoted 7 lines
Quoted 1 line

The soc node we have does not have a reg property ?

Not 100% sure what people will decide on this. There are a number of examples on the PPC side (arch/powerpc/boot/dts) that are soc at ADDR, but they don't typically have "reg" properties at the soc level.

Let's go ahead w/o the unit address (as you have it) for now.

What is the address even supposed to mean? Are we expecting multiple 'soc' nodes?

David

#9 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 10 lines · David Brown
Quoted 8 lines · Kumar Gala
Quoted 7 lines

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

The soc node we have does not have a reg property ?

Quoted 8 lines
Quoted 5 lines

Not 100% sure what people will decide on this. There are a number of examples on the PPC side (arch/powerpc/boot/dts) that are soc at ADDR, but they don't typically have "reg" properties at the soc level.

Let's go ahead w/o the unit address (as you have it) for now.

What is the address even supposed to mean? Are we expecting multiple 'soc' nodes?

What do we consider to exist under soc in general? I'd expect the address to be the base of the MMIO register register for on SoC devices (but that's based on my PPC history).

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#10 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

In reply to Kumar Gala
Quoted 46 lines · Kumar Gala
Quoted 43 lines · Rohit Vaswani
Quoted 25 lines · Rohit Vaswani
Quoted 24 lines · Kumar Gala

<snip>

+++ 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 { };

Quoted 11 lines
Quoted 9 lines

We should have a unit address here:

soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

};

Im not sure I understand the reasoning behind the unit address for soc ?

Quoted 8 lines
Quoted 3 lines

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

That still doesn't really answer anything :) - and I couldn't find any discussions about this either. I don't see anybody in upstream adding an address to soc except sun. What is that address supposed to be for - what does it mean ? The soc is way of encapsulating meaningful blocks for the particular SoC.

I see the mail from Stephen Warren for adding a check stating that

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

Quoted 5 lines
Quoted 1 line

The soc node we have does not have a reg property ?

Not 100% sure what people will decide on this. There are a number of examples on the PPC side (arch/powerpc/boot/dts) that are soc at ADDR, but they don't typically have "reg" properties at the soc level.

No, but you may have a ranges property which is related.

I've just hit this on highbank in needing to add a second bank of peripherals for midway. So my vote would be to have unit address.

Rob

#11 lore raw

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 53 lines · Rob Herring
Quoted 46 lines · Kumar Gala
Quoted 43 lines · Rohit Vaswani
Quoted 25 lines · Rohit Vaswani
Quoted 24 lines · Kumar Gala

<snip>

+++ 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 { };

Quoted 11 lines
Quoted 9 lines

We should have a unit address here:

soc: soc at FOOBAR {

also, split out the curly braces so any future patches do have to muck with that.

};

Im not sure I understand the reasoning behind the unit address for soc ?

Quoted 8 lines
Quoted 3 lines

Its fairly standard practice and there is a fair amount of discussion about the lack of a unit address for memory nodes.

That still doesn't really answer anything :) - and I couldn't find any discussions about this either. I don't see anybody in upstream adding an address to soc except sun. What is that address supposed to be for - what does it mean ? The soc is way of encapsulating meaningful blocks for the particular SoC.

I see the mail from Stephen Warren for adding a check stating that

"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address."

Quoted 5 lines
Quoted 1 line

The soc node we have does not have a reg property ?

Not 100% sure what people will decide on this. There are a number of examples on the PPC side (arch/powerpc/boot/dts) that are soc at ADDR, but they don't typically have "reg" properties at the soc level.

Quoted 6 lines

No, but you may have a ranges property which is related.

I've just hit this on highbank in needing to add a second bank of peripherals for midway. So my vote would be to have unit address.

Rob

So are we saying the rule for needing a unit-address being either 'reg' or 'ranges' ?

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#12 lore raw

PATCH 3/3 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974

In reply to Rohit Vaswani

This patch enables MSM8974 build support.

---
 arch/arm/configs/msm_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/msm_defconfig +1 -0
index 690b5f9..0ed32e5 100644
@@ -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