Skip to contentSkip to conversation

A trio of IXP425 boards

PATCH New Richard Cochran 3 participants 5 messages Sep 28, 2011 – Oct 7, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover A trio of IXP425 boards

This patch adds support for three boards using the ixp425. Since they are are almost identical to each other, they can share one setup file.

The three machine types are slated for removal due to the fact that the board support has not been merged. My polite request is to merge this patch and restore the machine types.

Thanks,
Richard

Richard Cochran (1):
ixp4xx: support omicron ixp425 based boards

 arch/arm/mach-ixp4xx/Kconfig                   |   19 ++
 arch/arm/mach-ixp4xx/Makefile                  |    4 +
 arch/arm/mach-ixp4xx/include/mach/uncompress.h |    3 +-
 arch/arm/mach-ixp4xx/miccpt-pci.c              |   78 +++++++
 arch/arm/mach-ixp4xx/omixp-setup.c             |  273 ++++++++++++++++++++++++
 5 files changed, 376 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
 create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 ixp4xx: support omicron ixp425 based boards

This patch adds board support for the DEVIXP, the MICCPT, and the MIC256, which are three IXP425 based boards produced by OMICRON electronics, GmbH.

---
 arch/arm/mach-ixp4xx/Kconfig                   |   19 ++
 arch/arm/mach-ixp4xx/Makefile                  |    4 +
 arch/arm/mach-ixp4xx/include/mach/uncompress.h |    3 +-
 arch/arm/mach-ixp4xx/miccpt-pci.c              |   78 +++++++
 arch/arm/mach-ixp4xx/omixp-setup.c             |  273 ++++++++++++++++++++++++
 5 files changed, 376 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
 create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
arch/arm/mach-ixp4xx/Kconfig +19 -0
index 6f991c5..fd5e7b6 100644
@@ -179,6 +179,25 @@ config MACH_GTWX5715
 		"High Speed" UART is n/c (as far as I can tell)
 		20 Pin ARM/Xscale JTAG interface on J2
 
+config MACH_DEVIXP
+	bool "Omicron DEVIXP"
+	help
+	  Say 'Y' here if you want your kernel to support the DEVIXP
+	  board from OMICRON electronics GmbH.
+
+config MACH_MICCPT
+	bool "Omicron MICCPT"
+	select PCI
+	help
+	  Say 'Y' here if you want your kernel to support the MICCPT
+	  board from OMICRON electronics GmbH.
+
+config MACH_MIC256
+	bool "Omicron MIC256"
+	help
+	  Say 'Y' here if you want your kernel to support the MIC256
+	  board from OMICRON electronics GmbH.
+
 comment "IXP4xx Options"
 
 config IXP4XX_INDIRECT_PCI
arch/arm/mach-ixp4xx/Makefile +4 -0
index d807fc3..eded94c 100644
@@ -10,6 +10,7 @@ obj-pci-$(CONFIG_MACH_AVILA)		+= avila-pci.o
 obj-pci-$(CONFIG_MACH_IXDPG425)		+= ixdpg425-pci.o
 obj-pci-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o
 obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o
+obj-pci-$(CONFIG_MACH_MICCPT)		+= miccpt-pci.o
 obj-pci-$(CONFIG_MACH_NSLU2)		+= nslu2-pci.o
 obj-pci-$(CONFIG_MACH_NAS100D)		+= nas100d-pci.o
 obj-pci-$(CONFIG_MACH_DSMG600)		+= dsmg600-pci.o
@@ -25,6 +26,9 @@ obj-$(CONFIG_MACH_AVILA)	+= avila-setup.o
 obj-$(CONFIG_MACH_IXDPG425)	+= coyote-setup.o
 obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-setup.o
 obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-setup.o
+obj-$(CONFIG_MACH_DEVIXP)	+= omixp-setup.o
+obj-$(CONFIG_MACH_MICCPT)	+= omixp-setup.o
+obj-$(CONFIG_MACH_MIC256)	+= omixp-setup.o
 obj-$(CONFIG_MACH_NSLU2)	+= nslu2-setup.o
 obj-$(CONFIG_MACH_NAS100D)	+= nas100d-setup.o
 obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
arch/arm/mach-ixp4xx/include/mach/uncompress.h +2 -1
index 219d7c1..eb945a9 100644
@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
 	 * Some boards are using UART2 as console
 	 */
 	if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
-			 machine_is_gateway7001() || machine_is_wg302v2())
+	    machine_is_gateway7001() || machine_is_wg302v2() ||
+	    machine_is_devixp() || machine_is_miccpt() || machine_is_mic256())
 		uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
 	else
 		uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
arch/arm/mach-ixp4xx/miccpt-pci.c new file +78 -0

78 lines not on this page · raw message

arch/arm/mach-ixp4xx/omixp-setup.c new file +273 -0

273 lines not on this page · raw message

Signature · 1 line
1.7.2.5
#2 lore raw

cover A trio of IXP425 boards

In reply to Richard Cochran
Quoted 6 lines · Richard Cochran

This patch adds support for three boards using the ixp425. Since they are are almost identical to each other, they can share one setup file.

The three machine types are slated for removal due to the fact that the board support has not been merged. My polite request is to merge this patch and restore the machine types.

This is a good idea, IMHO.

Unfortunately ATM I don't have access to kernel.org and being a bit busy with unrelated things, I'd rather avoid "processing" this patch personally if possible. Can you send it upstream yourself, please? Let me know of any problem.

Signature · 1 line
Krzysztof Halasa
#3 lore raw

cover A trio of IXP425 boards

Quoted 9 lines · Krzysztof Halasa
Quoted 6 lines · Richard Cochran

This patch adds support for three boards using the ixp425. Since they are are almost identical to each other, they can share one setup file.

The three machine types are slated for removal due to the fact that the board support has not been merged. My polite request is to merge this patch and restore the machine types.

Quoted 7 lines

This is a good idea, IMHO.

Unfortunately ATM I don't have access to kernel.org and being a bit busy with unrelated things, I'd rather avoid "processing" this patch personally if possible. Can you send it upstream yourself, please? Let me know of any problem.

Okay, then, Arnd? Russell?

Will one of you please take this patch?

Thanks,
Richard

#4 lore raw

cover A trio of IXP425 boards

Quoted 13 lines · Richard Cochran
Quoted 12 lines · Krzysztof Halasa
Quoted 6 lines · Richard Cochran

This patch adds support for three boards using the ixp425. Since they are are almost identical to each other, they can share one setup file.

The three machine types are slated for removal due to the fact that the board support has not been merged. My polite request is to merge this patch and restore the machine types.

This is a good idea, IMHO.

Quoted 8 lines
Quoted 4 lines

Unfortunately ATM I don't have access to kernel.org and being a bit busy with unrelated things, I'd rather avoid "processing" this patch personally if possible. Can you send it upstream yourself, please? Let me know of any problem.

Okay, then, Arnd? Russell?

Will one of you please take this patch?

Sorry I forgot to notify you. I had already taken the patch on monday, but it did not show up in linux-next because an unrelated change broke the build. It should be fixed now.

Arnd