arm: Iomega ix4-200d support

PATCH New Eric Sandeen 3 participants 3 messages Nov 13, 2009

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Eric Sandeen

author

2009-11-13 06:04 UTC #0 lore raw

PATCH 1/1 arm: Iomega ix4-200d support

The following is was (lightly) tested under 2.6.30 with a development board for the Iomega ix4-200d NAS box, which eventually released as:

http://go.iomega.com/en-us/products/network-storage-desktop/storcenter-network-storage-solution/network-hard-drive-ix4-200d/

It could probably use some tidying up, but perhaps it's a good starting place, at least.

Signed-off-by Eric Sandeen <[email protected]>

---

arch/arm/mach-kirkwood/Kconfig +6 -0

index 0aca451..2d306ec 100644
@@ -8,6 +8,12 @@ config MACH_DB88F6281_BP
 	  Say 'Y' here if you want your kernel to support the
 	  Marvell DB-88F6281-BP Development Board.
 
+config MACH_IX4_88F6281_NAS
+	bool "Iomega ix4-200d NAS"
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  Iomega ix4-200d NAS.
+
 config MACH_RD88F6192_NAS
 	bool "Marvell RD-88F6192-NAS Reference Board"
 	help

arch/arm/mach-kirkwood/Makefile +1 -0

index 80ab0ec..8613f6b 100644
@@ -1,6 +1,7 @@
 obj-y				+= common.o addr-map.o irq.o pcie.o mpp.o
 
 obj-$(CONFIG_MACH_DB88F6281_BP)		+= db88f6281-bp-setup.o
+obj-$(CONFIG_MACH_IX4_88F6281_NAS)	+= ix4-88f6281-setup.o
 obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd88f6192-nas-setup.o
 obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
 obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o

arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +135 -0

135 lines not on this page · raw message

arch/arm/tools/mach-types +1 -0

index c8c55b4..7d84176 100644
@@ -2132,6 +2132,7 @@ apollo			MACH_APOLLO		APOLLO			2141
 at91cap9stk		MACH_AT91CAP9STK	AT91CAP9STK		2142
 spc300			MACH_SPC300		SPC300			2143
 eko			MACH_EKO		EKO			2144
+nasix4200d		MACH_IX4_88F6281_NAS	NASIX4200D		2145
 ccw9m2443		MACH_CCW9M2443		CCW9M2443		2145
 ccw9m2443js		MACH_CCW9M2443JS	CCW9M2443JS		2146
 m2m_router_device	MACH_M2M_ROUTER_DEVICE	M2M_ROUTER_DEVICE	2147

Martin Michlmayr

2009-11-13 08:51 UTC #1 lore raw

PATCH 1/1 arm: Iomega ix4-200d support

arch/arm/mach-kirkwood/Kconfig config MACH_DB88F6281_BP · line 12

Quoted 2 lines · Eric Sandeen

arch/arm/mach-kirkwood/Kconfig +2 -0
+config MACH_IX4_88F6281_NAS
+	bool "Iomega ix4-200d NAS"

If you look at Kconfig, you'll see that putting the CPU id in the MACH name is quite unusual for NAS devices (it's only used for dev boards). I'd make this IX4200D or NASIX400D.

Also, the Kconfig entry should be at the end and not in the middle of some reference boards.

arch/arm/mach-kirkwood/ix4-88f6281-setup.c

Quoted 2 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +0 -0

nasix4200d.c or ix4200d.c

Quoted 2 lines

+/*
+ * Marvell RD-88F6281 Reference Board Setup

That's obviously copy&paste...

Quoted 3 lines

+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.

You should add your Copyright. And probably the Copyright of the file on which yours is baed.

arch/arm/mach-kirkwood/ix4-88f6281-setup.c

Quoted 2 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +2 -0
+
+/* #ifdef IX4_BOARD MV_BOARD_INFO db88f6281AInfo db88f6281AInfoBoardMacInfo */

What's that?

arch/arm/mach-kirkwood/ix4-88f6281-setup.c line 127

Quoted 2 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +2 -0
+MACHINE_START(NASIX4200D, "Iomega NAS ix4-200d")
+	/* Maintainer: Saeed Bishara <[email protected]> */

That should be you.

Quoted 7 lines

arch/arm/tools/mach-types +0 -0
@@ -2132,6 +2132,7 @@ apollo			MACH_APOLLO		APOLLO			2141
at91cap9stk MACH_AT91CAP9STK AT91CAP9STK 2142
spc300 MACH_SPC300 SPC300 2143
eko MACH_EKO EKO 2144
+nasix4200d MACH_IX4_88F6281_NAS NASIX4200D 2145

That's a big no. First of all, you have to register your own machine ID at http://www.arm.linux.org.uk/developer/machines/ Second, when you submit a patch, don't include mach-types since this is auto-generated.

Finally, a question: it seems that the buttons and LEDs are not supported by your patch. Do you know how they are hooked up?

Thanks for working on this

Signature · 2 lines

Martin Michlmayr
http://www.cyrius.com/

Eric Sandeen

2009-11-13 15:42 UTC #2 lore raw

PATCH 1/1 arm: Iomega ix4-200d support

Quoted 7 lines · Martin Michlmayr

arch/arm/mach-kirkwood/Kconfig config MACH_DB88F6281_BP · line 12
Quoted 2 lines · Eric Sandeen
arch/arm/mach-kirkwood/Kconfig +2 -0
+config MACH_IX4_88F6281_NAS
+	bool "Iomega ix4-200d NAS"
If you look at Kconfig, you'll see that putting the CPU id in the MACH name is quite unusual for NAS devices (it's only used for dev boards). I'd make this IX4200D or NASIX400D.

Quoted 2 lines

Also, the Kconfig entry should be at the end and not in the middle of some reference boards.

ok, not sure how it ended up there ;)

Quoted 8 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c
Quoted 2 lines
arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +0 -0
nasix4200d.c or ix4200d.c
Quoted 2 lines
+/*
+ * Marvell RD-88F6281 Reference Board Setup

Quoted 8 lines

That's obviously copy&paste...
Quoted 3 lines
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
You should add your Copyright. And probably the Copyright of the file on which yours is baed.

I'll have to find it :)

Quoted 4 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c
Quoted 2 lines
arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +2 -0
+
+/* #ifdef IX4_BOARD MV_BOARD_INFO db88f6281AInfo db88f6281AInfoBoardMacInfo */
What's that?

sorry, leftovers ...

Quoted 4 lines

arch/arm/mach-kirkwood/ix4-88f6281-setup.c line 127
Quoted 2 lines
arch/arm/mach-kirkwood/ix4-88f6281-setup.c new file +2 -0
+MACHINE_START(NASIX4200D, "Iomega NAS ix4-200d")
+	/* Maintainer: Saeed Bishara <[email protected]> */
That should be you.

:) aye.

Argh, sorry, should have read this better before I sent it, it was a quick hack - will clean this all up & resend.

Quoted 4 lines

Quoted 4 lines
arch/arm/tools/mach-types +0 -0
@@ -2132,6 +2132,7 @@ apollo			MACH_APOLLO		APOLLO			2141
at91cap9stk MACH_AT91CAP9STK AT91CAP9STK 2142

Quoted 8 lines

Quoted 3 lines
spc300 MACH_SPC300 SPC300 2143
eko MACH_EKO EKO 2144
+nasix4200d MACH_IX4_88F6281_NAS NASIX4200D 2145
That's a big no. First of all, you have to register your own machine ID at http://www.arm.linux.org.uk/developer/machines/ Second, when you submit a patch, don't include mach-types since this is auto-generated.

Quoted 2 lines

Finally, a question: it seems that the buttons and LEDs are not supported by your patch. Do you know how they are hooked up?

I can try to find out.

Quoted 1 line

Thanks for working on this

Sure, sorry it's such a mess on the first pass, thanks for the review. :)

-Eric