Skip to contentSkip to conversation

ARM: msm: Add support for APQ8074 Dragonboard

PATCH Superseded Rohit Vaswani 6 participants 16 messages Sep 6, 2013 – Sep 9, 2013

Subsystems (5)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 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/boot/dts/Makefile                |  3 ++-
 arch/arm/boot/dts/apq8074-dragonboard.dts |  6 ++++++
 arch/arm/boot/dts/msm8974.dtsi            | 35 +++++++++++++++++++++++++++++++
 arch/arm/mach-msm/Kconfig                 | 20 ++++++++++++++++--
 arch/arm/mach-msm/Makefile                |  1 +
 arch/arm/mach-msm/board-dt-8974.c         | 24 +++++++++++++++++++++
 6 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boot/dts/apq8074-dragonboard.dts
 create mode 100644 arch/arm/boot/dts/msm8974.dtsi
 create mode 100644 arch/arm/mach-msm/board-dt-8974.c
arch/arm/boot/dts/Makefile +2 -1
index 641b3c9a..bea54a7 100644
@@ -97,7 +97,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 \
+	apq8074-dragonboard.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +6 -0
new file mode 100644
index 0000000..5b7b6a0
@@ -0,0 +1,6 @@
+/include/ "msm8974.dtsi"
+
+/ {
+	model = "Qualcomm APQ8074 Dragonboard";
+	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};
arch/arm/boot/dts/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/mach-msm/Kconfig +18 -2
index 905efc8..499e8fe 100644
@@ -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
@@ -122,6 +137,7 @@ config MSM_SMD
 
 config MSM_GPIOMUX
 	bool
+	depends on !ARCH_MSM_DT
 	help
 	  Support for MSM V1 TLMM GPIOMUX architecture.
 
arch/arm/mach-msm/Makefile +1 -0
index d257ff4..80e3b15 100644
@@ -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
arch/arm/mach-msm/board-dt-8974.c new file +24 -0
new file mode 100644
index 0000000..01ed8d0
@@ -0,0 +1,24 @@
+/* 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",
+	"qcom,apq8074",
+	NULL
+};
+
+DT_MACHINE_START(MSM8974_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.dt_compat = msm8974_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
#1 lore raw

PATCH v3 2/2 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974

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
#2 lore raw
In reply to Rohit Vaswani
Quoted 6 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.

---

[..]

Quoted 19 lines

index 0000000..5b7b6a0

arch/arm/boot/dts/apq8074-dragonboard.dts new file +6 -0
@@ -0,0 +1,6 @@
+/include/ "msm8974.dtsi"
+
+/ {
+	model = "Qualcomm APQ8074 Dragonboard";
+	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};
arch/arm/boot/dts/msm8974.dtsi new file +3 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"

arch/arm/boot/dts/msm8974.dtsi line 13

Quoted 10 lines
arch/arm/boot/dts/msm8974.dtsi new file +10 -0
+
+/ {
+	model = "Qualcomm MSM8974";
+	compatible = "qcom,msm8974";
+	interrupt-parent = <&intc>;
+
+	soc: soc { };
+};
+
+&soc {

Breaking these up seems a little odd to me, but okay.

Quoted 26 lines
arch/arm/boot/dts/msm8974.dtsi new file +22 -0
+	#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 +0 -0
index 905efc8..499e8fe 100644

[..]

arch/arm/mach-msm/Kconfig config ARCH_MSM8960 · line 75

Quoted 13 lines
arch/arm/mach-msm/Kconfig +13 -0
+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)
+

Selecting _only_ ARCH_MSM8974 with these changes breaks the build with:

scripts/kconfig/conf --silentoldconfig Kconfig
#

# configuration written to .config
#
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
  CC      arch/arm/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CC      init/main.o
In file included from arch/arm/include/asm/irq.h:7:0,
                 from arch/arm/include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:8,
                 from include/linux/ftrace_event.h:7,
                 from include/trace/syscall.h:6,
                 from include/linux/syscalls.h:79,
                 from init/main.c:18:
arch/arm/mach-msm/include/mach/irqs.h:35:2: error: #error "Unknown architecture specification"
 #error "Unknown architecture specification"
  ^
arch/arm/mach-msm/include/mach/irqs.h:38:18: error: 'NR_MSM_IRQS' undeclared here (not in a function)
 #define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
                  ^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
 extern struct irq_desc irq_desc[NR_IRQS];
                                 ^
arch/arm/mach-msm/include/mach/irqs.h:38:32: error: 'NR_GPIO_IRQS' undeclared here (not in a function)
 #define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
                                ^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
 extern struct irq_desc irq_desc[NR_IRQS];
                                 ^
arch/arm/mach-msm/include/mach/irqs.h:38:47: error: 'NR_BOARD_IRQS' undeclared here (not in a function)
 #define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + NR_BOARD_IRQS)
                                               ^
include/linux/irqdesc.h:76:33: note: in expansion of macro 'NR_IRQS'
 extern struct irq_desc irq_desc[NR_IRQS];
                                 ^
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2

Josh

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

PATCH 1/1 ARM: msm: Remove irqs-*.h files for DT based targets

We don't want or need the irqs.h files from the DT based MSM targets. Remove these header files and select sparse irq so that we don't try to include the mach/irqs.h file.

---

Quoted 2 lines · Josh Cartwright

Selecting _only_ ARCH_MSM8974 with these changes breaks the build with:

I've been meaning to fix this. Perhaps you can use this patch as a base and then push the SPARSE_IRQ selection into the DT config?

 arch/arm/mach-msm/Kconfig                  |   2 +
 arch/arm/mach-msm/include/mach/irqs-8960.h | 277 -----------------------------
 arch/arm/mach-msm/include/mach/irqs-8x60.h | 258 ---------------------------
 arch/arm/mach-msm/include/mach/irqs.h      |   5 -
 4 files changed, 2 insertions(+), 540 deletions(-)
 delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h
 delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x60.h
arch/arm/mach-msm/Kconfig +2 -0
index 905efc8..30b3342 100644
@@ -50,6 +50,7 @@ config ARCH_MSM8X60
 	select HAVE_SMP
 	select MSM_SCM if SMP
 	select USE_OF
+	select SPARSE_IRQ
 
 config ARCH_MSM8960
 	bool "MSM8960"
@@ -59,6 +60,7 @@ config ARCH_MSM8960
 	select GPIO_MSM_V2
 	select MSM_SCM if SMP
 	select USE_OF
+	select SPARSE_IRQ
 
 config MSM_HAS_DEBUG_UART_HS
 	bool
arch/arm/mach-msm/include/mach/irqs-8960.h deleted +0 -277

277 lines not on this page · raw message

arch/arm/mach-msm/include/mach/irqs-8x60.h deleted +0 -258

258 lines not on this page · raw message

arch/arm/mach-msm/include/mach/irqs.h +0 -5
index 3cd78b1..164d355 100644
@@ -24,11 +24,6 @@
 #elif defined(CONFIG_ARCH_QSD8X50)
 #include "irqs-8x50.h"
 #include "sirc.h"
-#elif defined(CONFIG_ARCH_MSM8X60)
-#include "irqs-8x60.h"
-#elif defined(CONFIG_ARCH_MSM8960)
-/* TODO: Make these not generic. */
-#include "irqs-8960.h"
 #elif defined(CONFIG_ARCH_MSM_ARM11)
 #include "irqs-7x00.h"
 #else
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#4 lore raw

Re: [PATCH] ARM: msm: Remove irqs-*.h files for DT based targets

Quoted 13 lines · Stephen Boyd
arch/arm/mach-msm/Kconfig +1 -0
index 905efc8..30b3342 100644
@@ -50,6 +50,7 @@ config ARCH_MSM8X60
 	select HAVE_SMP
 	select MSM_SCM if SMP
 	select USE_OF
+	select SPARSE_IRQ
 
 config ARCH_MSM8960
 	bool "MSM8960"

arch/arm/mach-msm/Kconfig config ARCH_MSM8960 · line 63

Quoted 4 lines
arch/arm/mach-msm/Kconfig +1 -0
@@ -59,6 +60,7 @@ config ARCH_MSM8960
 	select GPIO_MSM_V2
 	select MSM_SCM if SMP
 	select USE_OF
+	select SPARSE_IRQ

Gah, I guess this needs to be sorted alphabetically.

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

Re: [PATCH] ARM: msm: Remove irqs-*.h files for DT based targets

In reply to Stephen Boyd
Quoted 5 lines · Stephen Boyd

We don't want or need the irqs.h files from the DT based MSM targets. Remove these header files and select sparse irq so that we don't try to include the mach/irqs.h file.

Quoted 8 lines

---

Quoted 2 lines · Josh Cartwright

Selecting _only_ ARCH_MSM8974 with these changes breaks the build with:

I've been meaning to fix this. Perhaps you can use this patch as a base and then push the SPARSE_IRQ selection into the DT config?

Sounds sane to me. AFAICT, we didn't yet have any users of these defines upstream. Using SPARSE_IRQ puts on the path of multiplatform support anyway.

FWIW, I tested this by applying this change under Rohit's and squashing the following with patch 1/2:

arch/arm/mach-msm/Kconfig +1 -2
index fe35acf..f4a0aaa 100644
@@ -50,7 +50,6 @@ config ARCH_MSM8X60
 	select HAVE_SMP
 	select MSM_SCM if SMP
 	select USE_OF
-	select SPARSE_IRQ
 
 config ARCH_MSM8960
 	bool "MSM8960"
@@ -60,7 +59,6 @@ config ARCH_MSM8960
 	select GPIO_MSM_V2
 	select MSM_SCM if SMP
 	select USE_OF
-	select SPARSE_IRQ
 
 config ARCH_MSM8974
 	bool "MSM8974"
@@ -74,6 +72,7 @@ config ARCH_MSM8974
 config ARCH_MSM_DT
 	def_bool y
 	depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
+	select SPARSE_IRQ
 
 config MSM_HAS_DEBUG_UART_HS
 	bool
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
#6 lore raw
In reply to Rohit Vaswani

Hi,

Some comments below.

Quoted 22 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/boot/dts/Makefile                |  3 ++-
 arch/arm/boot/dts/apq8074-dragonboard.dts |  6 ++++++
 arch/arm/boot/dts/msm8974.dtsi            | 35 +++++++++++++++++++++++++++++++
 arch/arm/mach-msm/Kconfig                 | 20 ++++++++++++++++--
 arch/arm/mach-msm/Makefile                |  1 +
 arch/arm/mach-msm/board-dt-8974.c         | 24 +++++++++++++++++++++
 6 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boot/dts/apq8074-dragonboard.dts
 create mode 100644 arch/arm/boot/dts/msm8974.dtsi
 create mode 100644 arch/arm/mach-msm/board-dt-8974.c
arch/arm/boot/dts/Makefile +0 -0
index 641b3c9a..bea54a7 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines
arch/arm/boot/dts/Makefile +2 -1
@@ -97,7 +97,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 \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 8 lines
arch/arm/boot/dts/Makefile +0 -0
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

arch/arm/boot/dts/apq8074-dragonboard.dts line 6

Quoted 7 lines
arch/arm/boot/dts/apq8074-dragonboard.dts new file +6 -0
@@ -0,0 +1,6 @@
+/include/ "msm8974.dtsi"
+
+/ {
+	model = "Qualcomm APQ8074 Dragonboard";
+	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};

Ok, I'm all for merging a early minimal dts file, but things like memory and a default bootargs tend to make sense.

arch/arm/boot/dts/msm8974.dtsi line 7

Quoted 13 lines
arch/arm/boot/dts/msm8974.dtsi new file +7 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+	model = "Qualcomm MSM8974";
+	compatible = "qcom,msm8974";

the board uses "qcom,apq8074" and this overrides this. Which way is it?

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

Quoted 3 lines
arch/arm/boot/dts/msm8974.dtsi new file +3 -0
+	interrupt-parent = <&intc>;
+
+	soc: soc { };

For files that include this it's ok to use the &phandle syntax, but in this base dtsi, please use proper structure. In other words, move the contents of the soc node up above instead.

Quoted 15 lines
arch/arm/boot/dts/msm8974.dtsi new file +15 -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>;
+	};

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

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

It'd make a lot of sense to include at least cpu nodes here as well, and ideally basics for the drivers you have already merged, such as uarts.

Quoted 6 lines
arch/arm/mach-msm/Kconfig +0 -0
index 905efc8..499e8fe 100644
@@ -1,12 +1,12 @@
 if ARCH_MSM

arch/arm/mach-msm/Kconfig line 9

Quoted 10 lines
arch/arm/mach-msm/Kconfig +2 -2
 
 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

This has nothing to do with adding support for dragonboard. Please break out the cleanup separately.

I'm not sure what the purpose of ARCH_MSM_DT is either, it just looks to complicate matter here?

Quoted 33 lines
arch/arm/mach-msm/Kconfig +15 -0
+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

arch/arm/mach-msm/Kconfig config MSM_SMD · line 142

Quoted 6 lines
arch/arm/mach-msm/Kconfig +1 -0
@@ -122,6 +137,7 @@ config MSM_SMD
 
 config MSM_GPIOMUX
 	bool
+	depends on !ARCH_MSM_DT
 	help
 	  Support for MSM V1 TLMM GPIOMUX architecture.

All of the above should be in a separate patch and motivated.

Quoted 32 lines
arch/arm/mach-msm/Makefile +1 -0
index d257ff4..80e3b15 100644
@@ -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
arch/arm/mach-msm/board-dt-8974.c new file +14 -0
new file mode 100644
index 0000000..01ed8d0
@@ -0,0 +1,24 @@
+/* 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>

arch/arm/mach-msm/board-dt-8974.c line 24

Quoted 10 lines
arch/arm/mach-msm/board-dt-8974.c new file +10 -0
+
+static const char * const msm8974_dt_match[] __initconst = {
+	"qcom,msm8974",
+	"qcom,apq8074",
+	NULL
+};
+
+DT_MACHINE_START(MSM8974_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.dt_compat = msm8974_dt_match,
+MACHINE_END

This file should be shared across SoCs. You should avoid adding a new dt board file for every SoC like this.

-Olof

#7 lore raw
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

arch/arm/boot/dts/Makefile +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
  	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

Quoted 10 lines

arch/arm/boot/dts/apq8074-dragonboard.dts line 6

Quoted 7 lines
arch/arm/boot/dts/apq8074-dragonboard.dts new file +6 -0
@@ -0,0 +1,6 @@
+/include/ "msm8974.dtsi"
+
+/ {
+	model = "Qualcomm APQ8074 Dragonboard";
+	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};

Ok, I'm all for merging a early minimal dts file, but things like memory and a default bootargs tend to make sense.

Quoted 14 lines

arch/arm/boot/dts/msm8974.dtsi line 7

Quoted 13 lines
arch/arm/boot/dts/msm8974.dtsi new file +7 -0
new file mode 100644
index 0000000..f04b643
@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+	model = "Qualcomm MSM8974";
+	compatible = "qcom,msm8974";

the board uses "qcom,apq8074" and this overrides this. Which way is it?

So, MSM8974 is the base chip. The APQ8074 is a board based on it with the modem fused. So, apq8074 board compatible overrides the generic chip compatible.

Quoted 7 lines

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

Quoted 4 lines
arch/arm/boot/dts/msm8974.dtsi new file +3 -0
+	interrupt-parent = <&intc>;
+
+	soc: soc { };

For files that include this it's ok to use the &phandle syntax, but in this base dtsi, please use proper structure. In other words, move the contents of the soc node up above instead.

Will do.

Quoted 20 lines
Quoted 20 lines
arch/arm/boot/dts/msm8974.dtsi new file +19 -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>,
Quoted 8 lines

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

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

It'd make a lot of sense to include at least cpu nodes here as well, and ideally basics for the drivers you have already merged, such as uarts.

Those are scheduled next as separate patches with some additional changes.

Quoted 20 lines
Quoted 7 lines
arch/arm/mach-msm/Kconfig +0 -0
index 905efc8..499e8fe 100644
@@ -1,12 +1,12 @@
  if ARCH_MSM

arch/arm/mach-msm/Kconfig line 9

Quoted 10 lines
arch/arm/mach-msm/Kconfig +2 -2
 
  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

This has nothing to do with adding support for dragonboard. Please break out the cleanup separately.

Quoted 2 lines

I'm not sure what the purpose of ARCH_MSM_DT is either, it just looks to complicate matter here?

ARCH_MSM_DT is just a combined config to denote the targets that have DT support instead of ORing the chip configs.

Quoted 78 lines
Quoted 33 lines
arch/arm/mach-msm/Kconfig +15 -0
+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

arch/arm/mach-msm/Kconfig config MSM_SMD · line 142

Quoted 6 lines
arch/arm/mach-msm/Kconfig +1 -0
@@ -122,6 +137,7 @@ config MSM_SMD
 
  config MSM_GPIOMUX
  	bool
+	depends on !ARCH_MSM_DT
  	help
  	  Support for MSM V1 TLMM GPIOMUX architecture.

All of the above should be in a separate patch and motivated.

Quoted 36 lines
arch/arm/mach-msm/Makefile +1 -0
index d257ff4..80e3b15 100644
@@ -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
arch/arm/mach-msm/board-dt-8974.c new file +18 -0
new file mode 100644
index 0000000..01ed8d0
@@ -0,0 +1,24 @@
+/* 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",
+	"qcom,apq8074",
Quoted 8 lines

arch/arm/mach-msm/board-dt-8974.c line 24

Quoted 6 lines
arch/arm/mach-msm/board-dt-8974.c new file +6 -0
+	NULL
+};
+
+DT_MACHINE_START(MSM8974_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.dt_compat = msm8974_dt_match,
+MACHINE_END

This file should be shared across SoCs. You should avoid adding a new dt board file for every SoC like this.

Will club these changes with the ARCH_MSM_DT seperation and send that out as a precursor patch to 8074 support.

Quoted 2 lines

-Olof

Thanks,
Rohit Vaswani

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
#8 lore raw
Quoted 27 lines · Rohit Vaswani
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

arch/arm/boot/dts/Makefile +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

arch/arm/boot/dts/Makefile +0 -0
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

- 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
#9 lore raw
Quoted 30 lines · Kumar Gala
Quoted 27 lines · Rohit Vaswani
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

arch/arm/boot/dts/Makefile +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

arch/arm/boot/dts/Makefile +0 -0
 	armada-370-mirabox.dtb \
 	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 3 lines
Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Hmm. It'd be nice for the filenames to be ${soc}-${board} so that e.g. U-Boot can easily calculate the DTB filename based on its soc/board environment variables... Luckily in my case for Tegra, all the Tegra chip names start with "Tegra", so we already sort all our DTB filenames together in the directory listing:-)

#10 lore raw
Quoted 33 lines · Stephen Warren
Quoted 32 lines · Kumar Gala
Quoted 28 lines · Rohit Vaswani
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

arch/arm/boot/dts/Makefile +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

Quoted 7 lines
Quoted 1 line

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Hmm. It'd be nice for the filenames to be ${soc}-${board} so that e.g. U-Boot can easily calculate the DTB filename based on its soc/board environment variables... Luckily in my case for Tegra, all the Tegra chip names start with "Tegra", so we already sort all our DTB filenames together in the directory listing:-)

u-boot's not supported on MSM platforms, so not sure what purpose this serves.

we might want to just introduce vendor dirs so its arch/arm/boot/dts/{vendor}/{soc}-{board}

Not sure if we want to argue about {vendor} vs {sub-arch}.

- 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
#11 lore raw
Quoted 38 lines · Kumar Gala
Quoted 35 lines · Stephen Warren
Quoted 33 lines · Kumar Gala
Quoted 27 lines · Rohit Vaswani
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ · line 101

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

arch/arm/boot/dts/Makefile +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Quoted 7 lines
Quoted 5 lines

Hmm. It'd be nice for the filenames to be ${soc}-${board} so that e.g. U-Boot can easily calculate the DTB filename based on its soc/board environment variables... Luckily in my case for Tegra, all the Tegra chip names start with "Tegra", so we already sort all our DTB filenames together in the directory listing:-)

u-boot's not supported on MSM platforms, so not sure what purpose this serves.

Presumably that's just because nobody has ported the code; it could be supported couldn't it?

Quoted 1 line

we might want to just introduce vendor dirs so its arch/arm/boot/dts/{vendor}/{soc}-{board}

That seems reasonable to me, although people will complain about the files moving again. Perhaps it's worth doing that as part of the move of *.dts out of the kernel?

Quoted 1 line

Not sure if we want to argue about {vendor} vs {sub-arch}.

sub-arch being the mach-xxx/plat-xxx directory? If so, I think that's a Linux-ism that shouldn't affect the DT directory layout.

#12 lore raw
Quoted 45 lines · Stephen Warren
Quoted 44 lines · Kumar Gala
Quoted 40 lines · Stephen Warren
Quoted 30 lines · Kumar Gala
Quoted 27 lines · Rohit Vaswani
Quoted 4 lines · Olof Johansson

Hi,

Some comments below.

Quoted 8 lines

Review

Quoted 6 lines · Rohit Vaswani

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

(quoted diff) +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 12 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 9 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 3 lines
Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Hmm. It'd be nice for the filenames to be ${soc}-${board} so that e.g. U-Boot can easily calculate the DTB filename based on its soc/board environment variables... Luckily in my case for Tegra, all the Tegra chip names start with "Tegra", so we already sort all our DTB filenames together in the directory listing:-)

Quoted 4 lines
Quoted 1 line

u-boot's not supported on MSM platforms, so not sure what purpose this serves.

Presumably that's just because nobody has ported the code; it could be supported couldn't it?

In theory.

Quoted 5 lines
Quoted 1 line

we might want to just introduce vendor dirs so its arch/arm/boot/dts/{vendor}/{soc}-{board}

That seems reasonable to me, although people will complain about the files moving again. Perhaps it's worth doing that as part of the move of *.dts out of the kernel?

Agreed, probably best since we'll probably be merging different arch dts's as well at that point

Quoted 4 lines
Quoted 1 line

Not sure if we want to argue about {vendor} vs {sub-arch}.

sub-arch being the mach-xxx/plat-xxx directory? If so, I think that's a Linux-ism that shouldn't affect the DT directory layout.

Yeah, the mach-xxx/plat-xxx dir, and agree that it being a Linux-ism we shouldn't apply to this.

- 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
#13 lore raw
Quoted 21 lines · Kumar Gala

<snip>

Quoted 19 lines · Rohit Vaswani
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 7 lines

Review

Quoted 6 lines

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

(quoted diff) +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 11 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 8 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Coming back to this, it would be better if the naming to be consistent with what we call our ARCH - msm and not qcom. msm8974-dragonboard signifies quite clearly what the board is.

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

<snip>

Thanks,
Rohit Vaswani

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
#14 lore raw
Quoted 22 lines · Rohit Vaswani
Quoted 21 lines · Kumar Gala

<snip>

Quoted 19 lines · Rohit Vaswani
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 7 lines

Review

Quoted 6 lines

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

(quoted diff) +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 11 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 8 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Coming back to this, it would be better if the naming to be consistent with what we call our ARCH - msm and not qcom. msm8974-dragonboard signifies quite clearly what the board is.

I was saying qcom,apq8074-dragonboard or we can do the dir thing as we don't have that mean qcom/msm device trees.

- 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
#15 lore raw
Quoted 24 lines · Kumar Gala
Quoted 22 lines · Rohit Vaswani
Quoted 21 lines · Kumar Gala

<snip>

Quoted 19 lines · Rohit Vaswani
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 7 lines

Review

Quoted 6 lines

This patch adds basic board support for APQ8074 Dragonboard <snip>
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

(quoted diff) +2 -1
-	msm8960-cdp.dtb
+	msm8960-cdp.dtb \
+	apq8074-dragonboard.dtb

Please add boards alphabetically.

Will do.

Quoted 11 lines

arch/arm/boot/dts/apq8074-dragonboard.dts

Quoted 8 lines
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
	armada-370-mirabox.dtb \
	armada-370-rd.dtb \
arch/arm/boot/dts/apq8074-dragonboard.dts new file +0 -0
new file mode 100644
index 0000000..5b7b6a0

arch/arm/boot/dts/ is getting really crowded. It's been working best if the SoC family or vendor is used as a prefix to keep things a bit more organized. In that spirit, prefixing these with msm-<foo> makes sense. Can you please do so?

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line

Sure. But the board is called an APQ8074 and we wanted to keep the naming consistent with that.

If we do this we should use qcom, not msm as the prefix. Match the device tree vendor prefix.

Coming back to this, it would be better if the naming to be consistent with what we call our ARCH - msm and not qcom. msm8974-dragonboard signifies quite clearly what the board is.

I was saying qcom,apq8074-dragonboard or we can do the dir thing as we don't have that mean qcom/msm device trees.

- k

Sure, that's fine. If there's a consensus on the name to match the compatible strings, could you send a patch out to rename the older dtsi's and I can add the Dragonboard support with it.

Thanks,
Rohit Vaswani

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