Skip to contentSkip to conversation

ARM: OMAP: convert N950/N9 to DT

PATCH New Aaro Koskinen 2 participants 7 messages Sep 24, 2013 – Oct 8, 2013

Subsystems (5)
lore
Share & tools
lore

Aaro Koskinen

author maintainer
#0 lore raw

v2 cover ARM: OMAP: convert N950/N9 to DT

Hi,

This adds DTS for N950/N9 and removes the legacy board file.

The following patches needs to be applied first:

http://marc.info/?l=linux-omap&m=137969869426861&w=2 (the whole series) [PATCH 0/4] Clean up legacy platform data handling for omaps for v3.13

http://marc.info/?l=linux-omap&m=137970770229676&w=2
[PATCH] ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT

Change history:

	v2: Replace patch 1 HACK by using pdata-quirks

	v1: http://marc.info/?l=linux-omap&m=137977135411888&w=2

A.

Aaro Koskinen (3):
ARM: OMAP2: pdata-quirks: set internal clock source for MMC2 on

    N950/N9

ARM: dts: add minimal DT support for Nokia N950 & N9 phones
ARM: OMAP2: delete board-rm680

 arch/arm/boot/dts/Makefile           |   2 +
 arch/arm/boot/dts/omap3-n9.dts       |  18 ++++
 arch/arm/boot/dts/omap3-n950-n9.dtsi | 172 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-n950.dts     |  18 ++++
 arch/arm/mach-omap2/Kconfig          |   7 --
 arch/arm/mach-omap2/Makefile         |   1 -
 arch/arm/mach-omap2/board-rm680.c    | 167 ----------------------------------
 arch/arm/mach-omap2/pdata-quirks.c   |  16 ++++
 8 files changed, 226 insertions(+), 175 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-n9.dts
 create mode 100644 arch/arm/boot/dts/omap3-n950-n9.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-n950.dts
 delete mode 100644 arch/arm/mach-omap2/board-rm680.c
Signature · 1 line
1.8.4.rc3
author maintainer
#1 lore raw

PATCH v2 1/3 ARM: OMAP2: pdata-quirks: set internal clock source for MMC2 on N950/N9

Set internal clock source for MMC2 on N950/N9.

---
 arch/arm/mach-omap2/pdata-quirks.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/mach-omap2/pdata-quirks.c +16 -0
index 52b4bc3..1a7f492 100644
@@ -16,6 +16,7 @@
 #include "common.h"
 #include "common-board-devices.h"
 #include "dss-common.h"
+#include "control.h"
 
 struct pdata_init {
 	const char *compatible;
@@ -62,6 +63,17 @@ static inline void omap_init_wl12xx_of(void)
 }
 #endif
 
+#ifdef CONFIG_ARCH_OMAP3
+static void __init hsmmc2_internal_input_clk(void)
+{
+	u32 reg;
+
+	reg = omap_ctrl_readl(OMAP343X_CONTROL_DEVCONF1);
+	reg |= OMAP2_MMCSDIO2ADPCLKISEL;
+	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
+}
+#endif /* CONFIG_ARCH_OMAP3 */
+
 #ifdef CONFIG_ARCH_OMAP4
 static void __init omap4_sdp_legacy_init(void)
 {
@@ -86,6 +98,10 @@ static void __init omap5_uevm_legacy_init(void)
 #endif
 
 static struct pdata_init pdata_quirks[] __initdata = {
+#ifdef CONFIG_ARCH_OMAP3
+	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
+	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
+#endif
 #ifdef CONFIG_ARCH_OMAP4
 	{ "ti,omap4-sdp", omap4_sdp_legacy_init, },
 	{ "ti,omap4-panda", omap4_panda_legacy_init, },
Signature · 1 line
1.8.4.rc3
maintainer Applied
#2 lore raw

PATCH v2 1/3 ARM: OMAP2: pdata-quirks: set internal clock source for MMC2 on N950/N9

Quoted 3 lines · Aaro Koskinen

Set internal clock source for MMC2 on N950/N9.

Thanks applied into omap-for-v3.13/quirk and pushed out.

I'll apply the board file removal later on into a separate branch, and Benoit can pick the .dts changes.

Regards,

Tony

Quoted 47 lines
 arch/arm/mach-omap2/pdata-quirks.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/mach-omap2/pdata-quirks.c +16 -0
index 52b4bc3..1a7f492 100644
@@ -16,6 +16,7 @@
 #include "common.h"
 #include "common-board-devices.h"
 #include "dss-common.h"
+#include "control.h"
 
 struct pdata_init {
 	const char *compatible;
@@ -62,6 +63,17 @@ static inline void omap_init_wl12xx_of(void)
 }
 #endif
 
+#ifdef CONFIG_ARCH_OMAP3
+static void __init hsmmc2_internal_input_clk(void)
+{
+	u32 reg;
+
+	reg = omap_ctrl_readl(OMAP343X_CONTROL_DEVCONF1);
+	reg |= OMAP2_MMCSDIO2ADPCLKISEL;
+	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
+}
+#endif /* CONFIG_ARCH_OMAP3 */
+
 #ifdef CONFIG_ARCH_OMAP4
 static void __init omap4_sdp_legacy_init(void)
 {
@@ -86,6 +98,10 @@ static void __init omap5_uevm_legacy_init(void)
 #endif
 
 static struct pdata_init pdata_quirks[] __initdata = {
+#ifdef CONFIG_ARCH_OMAP3
+	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
+	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
+#endif
 #ifdef CONFIG_ARCH_OMAP4
 	{ "ti,omap4-sdp", omap4_sdp_legacy_init, },
 	{ "ti,omap4-panda", omap4_panda_legacy_init, },
Signature · 1 line
1.8.4.rc3
author maintainer
#3 lore raw

PATCH v2 2/3 ARM: dts: add minimal DT support for Nokia N950 & N9 phones

In reply to Aaro Koskinen

Add minimal DT support for Nokia N950 & N9 phones. The same functionality that is provided by the current board file should work: serial console, USB, OneNAND and MMC.

---
 arch/arm/boot/dts/Makefile           |   2 +
 arch/arm/boot/dts/omap3-n9.dts       |  18 ++++
 arch/arm/boot/dts/omap3-n950-n9.dtsi | 172 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-n950.dts     |  18 ++++
 4 files changed, 210 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap3-n9.dts
 create mode 100644 arch/arm/boot/dts/omap3-n950-n9.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-n950.dts
arch/arm/boot/dts/Makefile +2 -0
index e95af3f..3b611ba 100644
@@ -173,6 +173,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap3-tobi.dtb \
 	omap3-igep0020.dtb \
 	omap3-igep0030.dtb \
+	omap3-n9.dtb \
+	omap3-n950.dtb \
 	omap4-panda.dtb \
 	omap4-panda-a4.dtb \
 	omap4-panda-es.dtb \
arch/arm/boot/dts/omap3-n9.dts new file +18 -0
new file mode 100644
index 0000000..39828ce
@@ -0,0 +1,18 @@
+/*
+ * omap3-n9.dts - Device Tree file for Nokia N9
+ *
+ * Written by: Aaro Koskinen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+#include "omap3-n950-n9.dtsi"
+
+/ {
+	model = "Nokia N9";
+	compatible = "nokia,omap3-n9", "ti,omap3";
+};
arch/arm/boot/dts/omap3-n950-n9.dtsi new file +172 -0

172 lines not on this page · raw message

arch/arm/boot/dts/omap3-n950.dts new file +18 -0
new file mode 100644
index 0000000..b076a52
@@ -0,0 +1,18 @@
+/*
+ * omap3-n950.dts - Device Tree file for Nokia N950
+ *
+ * Written by: Aaro Koskinen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+#include "omap3-n950-n9.dtsi"
+
+/ {
+	model = "Nokia N950";
+	compatible = "nokia,omap3-n950", "ti,omap3";
+};
Signature · 1 line
1.8.4.rc3
maintainer
#4 lore raw

PATCH v2 2/3 ARM: dts: add minimal DT support for Nokia N950 & N9 phones

Quoted 3 lines · Aaro Koskinen

Add minimal DT support for Nokia N950 & N9 phones. The same functionality that is provided by the current board file should work: serial console, USB, OneNAND and MMC.

Assuming Benoit will pick this one up:

author maintainer
#5 lore raw

PATCH v2 3/3 ARM: OMAP2: delete board-rm680

In reply to Aaro Koskinen

Delete board file for Nokia RM-680/RM-696 (N950/N9). DT-based booting should be used for further development on this HW.

---
 arch/arm/mach-omap2/Kconfig       |   7 --
 arch/arm/mach-omap2/Makefile      |   1 -
 arch/arm/mach-omap2/board-rm680.c | 167 --------------------------------------
 3 files changed, 175 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/Kconfig +0 -7
index f6a1db1..6850bf9 100644
@@ -310,13 +310,6 @@ config MACH_NOKIA_N8X0
 	select MACH_NOKIA_N810_WIMAX
 	select OMAP_PACKAGE_ZAC
 
-config MACH_NOKIA_RM680
-	bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
-	depends on ARCH_OMAP3
-	default y
-	select MACH_NOKIA_RM696
-	select OMAP_PACKAGE_CBB
-
 config MACH_NOKIA_RX51
 	bool "Nokia N900 (RX-51) phone"
 	depends on ARCH_OMAP3
arch/arm/mach-omap2/Makefile +0 -1
index f8d4a1b..1d2917b 100644
@@ -246,7 +246,6 @@ obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o
 obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o
-obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o
arch/arm/mach-omap2/board-rm680.c deleted +0 -167

167 lines not on this page · raw message

Signature · 1 line
1.8.4.rc3
maintainer
#6 lore raw

PATCH v2 3/3 ARM: OMAP2: delete board-rm680

Quoted 2 lines · Aaro Koskinen

Delete board file for Nokia RM-680/RM-696 (N950/N9). DT-based booting should be used for further development on this HW.

I'll apply this into omap-for-v3.13/board-removal that I will rebase on Benoit's .dts changes before I push out that branch.

Regards,

Tony