Skip to contentSkip to conversation

ARM: kirkwood: Add support for the MPL CEC4

PATCH New Stefan Peter 2 participants 3 messages Nov 18, 2012 – Nov 19, 2012

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Stefan Peter

author
#0 lore raw

v2 cover ARM: kirkwood: Add support for the MPL CEC4

The MPL CEC4 is a compact industrial computer for harsh environments. You can find out more about it at http://www.mpl.ch/t2640.html

This patch adds basic board support using the device tree where possible.

Changes since V1
* Replaced the 'compatible' entry "mpl,mplcec4", with "mpl,cec4-10", "mpl,cec4" in kirkwood-mplcec4.dts
* Removed unneeded clk headers in board-mplcec4.c
* Fixed sorting order of the kirkwood-mplcec4.dts entry in arm/boot/dts/Makefile

Stefan Peter (1):
Add support for the MPL CEC4

 arch/arm/boot/dts/Makefile             |    1 +
 arch/arm/boot/dts/kirkwood-mplcec4.dts |  119 ++++++++++++++++++++++++++++++++
 arch/arm/configs/kirkwood_defconfig    |    1 +
 arch/arm/mach-kirkwood/Kconfig         |    7 ++
 arch/arm/mach-kirkwood/Makefile        |    1 +
 arch/arm/mach-kirkwood/board-dt.c      |    4 ++
 arch/arm/mach-kirkwood/board-mplcec4.c |   80 +++++++++++++++++++++
 arch/arm/mach-kirkwood/common.h        |    6 ++
 8 files changed, 219 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-mplcec4.dts
 create mode 100644 arch/arm/mach-kirkwood/board-mplcec4.c
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/1 ARM: kirkwood: Add support for the MPL CEC4

Signed-off-by Stefan Peter <[email protected]>

---

arch/arm/boot/dts/Makefile +1 -0
index f37cf9f..54d08b2 100644
@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 	kirkwood-km_kirkwood.dtb \
 	kirkwood-lschlv2.dtb \
 	kirkwood-lsxhl.dtb \
+	kirkwood-mplcec4.dtb \
 	kirkwood-ts219-6281.dtb \
 	kirkwood-ts219-6282.dtb
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
arch/arm/boot/dts/kirkwood-mplcec4.dts new file +119 -0

119 lines not on this page · raw message

arch/arm/configs/kirkwood_defconfig +1 -0
index 74eee0c..6b50d97 100644
@@ -27,6 +27,7 @@ CONFIG_MACH_GOFLEXNET_DT=y
 CONFIG_MACH_LSXL_DT=y
 CONFIG_MACH_IOMEGA_IX2_200_DT=y
 CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
arch/arm/mach-kirkwood/Kconfig +7 -0
index 50bca50..19fd95c 100644
@@ -130,6 +130,13 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_MPLCEC4_DT
+	bool "MPL CEC4 (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  MPL CEC4 (Flattened Device Tree).
+
 config MACH_TS219
 	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
 	help
arch/arm/mach-kirkwood/Makefile +1 -0
index 294779f..a523b90 100644
@@ -31,3 +31,4 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_MPLCEC4_DT)		+= board-mplcec4.o
arch/arm/mach-kirkwood/board-dt.c +4 -0
index d94872f..143bfc9 100644
@@ -94,6 +94,9 @@ static void __init kirkwood_dt_init(void)
 	if (of_machine_is_compatible("keymile,km_kirkwood"))
 		km_kirkwood_init();
 
+	if (of_machine_is_compatible("mpl,cec4"))
+		mplcec4_init();
+
 	of_platform_populate(NULL, kirkwood_dt_match_table,
 			     kirkwood_auxdata_lookup, NULL);
 }

@@ -110,6 +113,7 @@ static const char *kirkwood_dt_board_compat[] = {
 	"buffalo,lsxl",
 	"iom,ix2-200",
 	"keymile,km_kirkwood",
+	"mpl,cec4",
 	NULL
 };
arch/arm/mach-kirkwood/board-mplcec4.c new file +80 -0

80 lines not on this page · raw message

arch/arm/mach-kirkwood/common.h +6 -0
index bcffd7c..6f18f27 100644
@@ -112,6 +112,12 @@ void km_kirkwood_init(void);
 static inline void km_kirkwood_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_MPLCEC4_DT
+void mplcec4_init(void);
+#else
+static inline void mplcec4_init(void) {};
+#endif
+
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);
Signature · 1 line
1.7.9.5
#2 lore raw

v2 cover ARM: kirkwood: Add support for the MPL CEC4

In reply to Stefan Peter
Quoted 11 lines · Stefan Peter

The MPL CEC4 is a compact industrial computer for harsh environments. You can find out more about it at http://www.mpl.ch/t2640.html

This patch adds basic board support using the device tree where possible.

Changes since V1
* Replaced the 'compatible' entry "mpl,mplcec4", with "mpl,cec4-10", "mpl,cec4" in kirkwood-mplcec4.dts
* Removed unneeded clk headers in board-mplcec4.c
* Fixed sorting order of the kirkwood-mplcec4.dts entry in arm/boot/dts/Makefile

Hi Stefan

Looks good. Thanks for making the changes.

Acked-by Andrew Lunn <[email protected]>

Andrew

Quoted 19 lines

Stefan Peter (1):
Add support for the MPL CEC4

 arch/arm/boot/dts/Makefile             |    1 +
 arch/arm/boot/dts/kirkwood-mplcec4.dts |  119 ++++++++++++++++++++++++++++++++
 arch/arm/configs/kirkwood_defconfig    |    1 +
 arch/arm/mach-kirkwood/Kconfig         |    7 ++
 arch/arm/mach-kirkwood/Makefile        |    1 +
 arch/arm/mach-kirkwood/board-dt.c      |    4 ++
 arch/arm/mach-kirkwood/board-mplcec4.c |   80 +++++++++++++++++++++
 arch/arm/mach-kirkwood/common.h        |    6 ++
 8 files changed, 219 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-mplcec4.dts
 create mode 100644 arch/arm/mach-kirkwood/board-mplcec4.c
Signature · 1 line
1.7.9.5