[PATCH 0/4] ARM: Gemini: board/maintainer updates

[PATCH 0/4] ARM: Gemini: board/maintainer updates

[Hans Ulli Kroll]

Hello to all,

Here are some board updates for the Gemini SoC

The sources are from the openwrt-team and Janos Laube.
I've removed only parts that are not in Linus' tree, mainly drivers for 
ethernet, usb and other stuff.

The the driver for watchdog and rtc are ready to ship.
These will be added on the next round, avoiding some chicken and egg 
problem ;-)

Patches 1-3 _must_ be applied in order, due Kconfig and Makefile changes.

Ulli

Hans Ulli Kroll (1):
      MAINTAINERS: update for ARM/Gemini

Imre Kaloz (2):
      ARM: Gemini: add support for Wiligear WBD-111
      ARM: Gemini: add support for Wiliboard WBD-222

Janos Laube (1):
      ARM: Gemini: add support for Raidsonic IB4220

 MAINTAINERS                           |   11 ++-
 arch/arm/mach-gemini/Kconfig          |   21 +++++
 arch/arm/mach-gemini/Makefile         |    3 +
 arch/arm/mach-gemini/board-nas4220b.c |  111 +++++++++++++++++++++++++
 arch/arm/mach-gemini/board-wbd111.c   |  143 +++++++++++++++++++++++++++++++++
 arch/arm/mach-gemini/board-wbd222.c   |  143 +++++++++++++++++++++++++++++++++
 6 files changed, 427 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/mach-gemini/board-nas4220b.c
 create mode 100644 arch/arm/mach-gemini/board-wbd111.c
 create mode 100644 arch/arm/mach-gemini/board-wbd222.c

[PATCH 1/4] ARM: Gemini: add support for Wiligear WBD-111

[Hans Ulli Kroll]

From: Imre Kaloz <kaloz@openwrt.org>

Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 arch/arm/mach-gemini/Kconfig        |    7 ++
 arch/arm/mach-gemini/Makefile       |    1 +
 arch/arm/mach-gemini/board-wbd111.c |  143 +++++++++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-gemini/board-wbd111.c

diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
index 515b75c..4de67ce 100644
--- a/arch/arm/mach-gemini/Kconfig
+++ b/arch/arm/mach-gemini/Kconfig
@@ -9,6 +9,13 @@ config MACH_RUT100
 	  Say Y here if you intend to run this kernel on a
 	  Teltonika 3G Router RUT100.
 
+config MACH_WBD111
+	bool "Wiliboard WBD-111"
+	select GEMINI_MEM_SWAP
+	help
+	  Say Y here if you intend to run this kernel on a
+	  Wiliboard WBD-111.
+
 endmenu
 
 config GEMINI_MEM_SWAP
diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
index 719505b..3997487 100644
--- a/arch/arm/mach-gemini/Makefile
+++ b/arch/arm/mach-gemini/Makefile
@@ -8,3 +8,4 @@ obj-y			:= irq.o mm.o time.o devices.o gpio.o
 
 # Board-specific support
 obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
+obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
new file mode 100644
index 0000000..36538c1
--- /dev/null
+++ b/arch/arm/mach-gemini/board-wbd111.c
@@ -0,0 +1,143 @@
+/*
+ *  Support for Wiliboard WBD-111
+ *
+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/skbuff.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+
+#include "common.h"
+
+static struct gpio_keys_button wbd111_keys[] = {
+	{
+		.code		= KEY_SETUP,
+		.gpio		= 5,
+		.active_low	= 1,
+		.desc		= "reset",
+		.type		= EV_KEY,
+	},
+};
+
+static struct gpio_keys_platform_data wbd111_keys_data = {
+	.buttons	= wbd111_keys,
+	.nbuttons	= ARRAY_SIZE(wbd111_keys),
+};
+
+static struct platform_device wbd111_keys_device = {
+	.name	= "gpio-keys",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &wbd111_keys_data,
+	},
+};
+
+static struct gpio_led wbd111_leds[] = {
+	{
+		.name			= "L3red",
+		.gpio			= 1,
+	},
+	{
+		.name			= "L4green",
+		.gpio			= 2,
+	},
+	{
+		.name			= "L4red",
+		.gpio			= 3,
+	},
+	{
+		.name			= "L3green",
+		.gpio			= 5,
+	},
+};
+
+static struct gpio_led_platform_data wbd111_leds_data = {
+	.num_leds	= ARRAY_SIZE(wbd111_leds),
+	.leds		= wbd111_leds,
+};
+
+static struct platform_device wbd111_leds_device = {
+	.name	= "leds-gpio",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &wbd111_leds_data,
+	},
+};
+
+static struct sys_timer wbd111_timer = {
+	.init	= gemini_timer_init,
+};
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition wbd111_partitions[] = {
+	{
+		.name		= "RedBoot",
+		.offset		= 0,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "kernel",
+		.offset		= 0x020000,
+		.size		= 0x100000,
+	} , {
+		.name		= "rootfs",
+		.offset		= 0x120000,
+		.size		= 0x6a0000,
+	} , {
+		.name		= "VCTL",
+		.offset		= 0x7c0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "cfg",
+		.offset		= 0x7d0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "FIS",
+		.offset		= 0x7e0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+#define wbd111_num_partitions	ARRAY_SIZE(wbd111_partitions)
+#else
+#define wbd111_partitions	NULL
+#define wbd111_num_partitions	0
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static void __init wbd111_init(void)
+{
+	gemini_gpio_init();
+	platform_register_uart();
+	platform_register_pflash(SZ_8M, wbd111_partitions,
+				 wbd111_num_partitions);
+	platform_device_register(&wbd111_leds_device);
+	platform_device_register(&wbd111_keys_device);
+}
+
+MACHINE_START(WBD111, "Wiliboard WBD-111")
+	.phys_io	= 0x7fffc000,
+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
+	.boot_params	= 0x100,
+	.map_io		= gemini_map_io,
+	.init_irq	= gemini_init_irq,
+	.timer		= &wbd111_timer,
+	.init_machine	= wbd111_init,
+MACHINE_END
-- 
1.7.0.3

[PATCH 2/4] ARM: Gemini: add support for Wiliboard WBD-222

[Hans Ulli Kroll]

From: Imre Kaloz <kaloz@openwrt.org>

Add support for Wiliboard WBD-222.

Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 arch/arm/mach-gemini/Kconfig        |    7 ++
 arch/arm/mach-gemini/Makefile       |    1 +
 arch/arm/mach-gemini/board-wbd222.c |  143 +++++++++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-gemini/board-wbd222.c

diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
index 4de67ce..7997500 100644
--- a/arch/arm/mach-gemini/Kconfig
+++ b/arch/arm/mach-gemini/Kconfig
@@ -16,6 +16,13 @@ config MACH_WBD111
 	  Say Y here if you intend to run this kernel on a
 	  Wiliboard WBD-111.
 
+config MACH_WBD222
+        bool "Wiliboard WBD-222"
+        select GEMINI_MEM_SWAP
+        help
+          Say Y here if you intend to run this kernel on a
+          Wiliboard WBD-222.
+
 endmenu
 
 config GEMINI_MEM_SWAP
diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
index 3997487..8e02c47 100644
--- a/arch/arm/mach-gemini/Makefile
+++ b/arch/arm/mach-gemini/Makefile
@@ -9,3 +9,4 @@ obj-y			:= irq.o mm.o time.o devices.o gpio.o
 # Board-specific support
 obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
 obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
+obj-$(CONFIG_MACH_WBD222)	+= board-wbd222.o
diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
new file mode 100644
index 0000000..ece8b4c
--- /dev/null
+++ b/arch/arm/mach-gemini/board-wbd222.c
@@ -0,0 +1,143 @@
+/*
+ *  Support for Wiliboard WBD-222
+ *
+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/skbuff.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+
+#include "common.h"
+
+static struct gpio_keys_button wbd222_keys[] = {
+	{
+		.code		= KEY_SETUP,
+		.gpio		= 5,
+		.active_low	= 1,
+		.desc		= "reset",
+		.type		= EV_KEY,
+	},
+};
+
+static struct gpio_keys_platform_data wbd222_keys_data = {
+	.buttons	= wbd222_keys,
+	.nbuttons	= ARRAY_SIZE(wbd222_keys),
+};
+
+static struct platform_device wbd222_keys_device = {
+	.name	= "gpio-keys",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &wbd222_keys_data,
+	},
+};
+
+static struct gpio_led wbd222_leds[] = {
+	{
+		.name			= "L3red",
+		.gpio			= 1,
+	},
+	{
+		.name			= "L4green",
+		.gpio			= 2,
+	},
+	{
+		.name			= "L4red",
+		.gpio			= 3,
+	},
+	{
+		.name			= "L3green",
+		.gpio			= 5,
+	},
+};
+
+static struct gpio_led_platform_data wbd222_leds_data = {
+	.num_leds	= ARRAY_SIZE(wbd222_leds),
+	.leds		= wbd222_leds,
+};
+
+static struct platform_device wbd222_leds_device = {
+	.name	= "leds-gpio",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &wbd222_leds_data,
+	},
+};
+
+static struct sys_timer wbd222_timer = {
+	.init	= gemini_timer_init,
+};
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition wbd222_partitions[] = {
+	{
+		.name		= "RedBoot",
+		.offset		= 0,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "kernel",
+		.offset		= 0x020000,
+		.size		= 0x100000,
+	} , {
+		.name		= "rootfs",
+		.offset		= 0x120000,
+		.size		= 0x6a0000,
+	} , {
+		.name		= "VCTL",
+		.offset		= 0x7c0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "cfg",
+		.offset		= 0x7d0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	} , {
+		.name		= "FIS",
+		.offset		= 0x7e0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+#define wbd222_num_partitions	ARRAY_SIZE(wbd222_partitions)
+#else
+#define wbd222_partitions	NULL
+#define wbd222_num_partitions	0
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static void __init wbd222_init(void)
+{
+	gemini_gpio_init();
+	platform_register_uart();
+	platform_register_pflash(SZ_8M, wbd222_partitions,
+		wbd222_num_partitions);
+	platform_device_register(&wbd222_leds_device);
+	platform_device_register(&wbd222_keys_device);
+}
+
+MACHINE_START(WBD222, "Wiliboard WBD-222")
+	.phys_io	= 0x7fffc000,
+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
+	.boot_params	= 0x100,
+	.map_io		= gemini_map_io,
+	.init_irq	= gemini_init_irq,
+	.timer		= &wbd222_timer,
+	.init_machine	= wbd222_init,
+MACHINE_END
-- 
1.7.0.3

[PATCH 3/4] ARM: Gemini: add support for Raidsonic IB4220

[Hans Ulli Kroll]

From: Janos Laube <janos.dev@gmail.com>

Add support for Nasbox IB4220 from Raidsonic.

Signed-off-by: Janos Laube <janos.dev@gmail.com>
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 arch/arm/mach-gemini/Kconfig          |    7 ++
 arch/arm/mach-gemini/Makefile         |    1 +
 arch/arm/mach-gemini/board-nas4220b.c |  111 +++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-gemini/board-nas4220b.c

diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
index 7997500..6f066ee 100644
--- a/arch/arm/mach-gemini/Kconfig
+++ b/arch/arm/mach-gemini/Kconfig
@@ -2,6 +2,13 @@ if ARCH_GEMINI
 
 menu "Cortina Systems Gemini Implementations"
 
+config MACH_NAS4220B
+	bool "Raidsonic NAS-4220-B"
+	select GEMINI_MEM_SWAP
+	help
+	  Say Y here if you intend to run this kernel on a
+	  Raidsonic NAS-4220-B.
+
 config MACH_RUT100
 	bool "Teltonika RUT100"
 	select GEMINI_MEM_SWAP
diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
index 8e02c47..c5b24b9 100644
--- a/arch/arm/mach-gemini/Makefile
+++ b/arch/arm/mach-gemini/Makefile
@@ -7,6 +7,7 @@
 obj-y			:= irq.o mm.o time.o devices.o gpio.o
 
 # Board-specific support
+obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o
 obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
 obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
 obj-$(CONFIG_MACH_WBD222)	+= board-wbd222.o
diff --git a/arch/arm/mach-gemini/board-nas4220b.c b/arch/arm/mach-gemini/board-nas4220b.c
new file mode 100644
index 0000000..01f1d6d
--- /dev/null
+++ b/arch/arm/mach-gemini/board-nas4220b.c
@@ -0,0 +1,111 @@
+/*
+ *  Support for Raidsonic NAS-4220-B
+ *
+ *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
+ *
+ * based on rut1xx.c
+ *  Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/io.h>
+
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include <mach/hardware.h>
+#include <mach/global_reg.h>
+
+#include "common.h"
+
+static struct sys_timer ib4220b_timer = {
+	.init	= gemini_timer_init,
+};
+
+static struct gpio_led ib4220b_leds[] = {
+	{
+		.name			= "nas4220b:orange:hdd",
+		.default_trigger	= "none",
+		.gpio			= 60,
+	},
+	{
+		.name			= "nas4220b:green:os",
+		.default_trigger	= "heartbeat",
+		.gpio			= 62,
+	},
+};
+
+static struct gpio_led_platform_data ib4220b_leds_data = {
+	.num_leds	= ARRAY_SIZE(ib4220b_leds),
+	.leds		= ib4220b_leds,
+};
+
+static struct platform_device ib4220b_led_device = {
+	.name	= "leds-gpio",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &ib4220b_leds_data,
+	},
+};
+
+static struct gpio_keys_button ib4220b_keys[] = {
+	{
+		.code		= KEY_SETUP,
+		.gpio		= 61,
+		.active_low	= 1,
+		.desc		= "Backup Button",
+		.type		= EV_KEY,
+	},
+	{
+		.code		= KEY_RESTART,
+		.gpio		= 63,
+		.active_low	= 1,
+		.desc		= "Softreset Button",
+		.type		= EV_KEY,
+	},
+};
+
+static struct gpio_keys_platform_data ib4220b_keys_data = {
+	.buttons	= ib4220b_keys,
+	.nbuttons	= ARRAY_SIZE(ib4220b_keys),
+};
+
+static struct platform_device ib4220b_key_device = {
+	.name	= "gpio-keys",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &ib4220b_keys_data,
+	},
+};
+
+static void __init ib4220b_init(void)
+{
+	gemini_gpio_init();
+	platform_register_uart();
+	platform_register_pflash(SZ_16M, NULL, 0);
+	platform_device_register(&ib4220b_led_device);
+	platform_device_register(&ib4220b_key_device);
+}
+
+MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B")
+	.phys_io	= 0x7fffc000,
+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
+	.boot_params	= 0x100,
+	.map_io		= gemini_map_io,
+	.init_irq	= gemini_init_irq,
+	.timer		= &ib4220b_timer,
+	.init_machine	= ib4220b_init,
+MACHINE_END
-- 
1.7.0.3

[PATCH 4/4] MAINTAINERS: update for ARM/Gemini

[Hans Ulli Kroll]

Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 MAINTAINERS |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 449d444..8a0fe7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -620,10 +620,10 @@ M:	Richard Purdie <rpurdie@rpsys.net>
 S:	Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
-T:	git git://gitorious.org/linux-gemini/mainline.git
-S:	Odd Fixes
+T:	git git://git.berlios.de/gemini-board
+S:	Maintained
 F:	arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -645,9 +645,10 @@ T:	topgit git://git.openezx.org/openezx.git
 F:	arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
-S:	Odd Fixes
+S:	Maintained
+T:	git://git.berlios.de/gemini-board
 F:	arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
-- 
1.7.0.3

[PATCH 1/4] ARM: Gemini: add support for Wiligear WBD-111

[Imre Kaloz]

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

On Mon, 10 May 2010 22:06:58 +0200, Hans Ulli Kroll <ulli.kroll@googlemail.com> wrote:

> From: Imre Kaloz <kaloz@openwrt.org>
>
> Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> ---
>  arch/arm/mach-gemini/Kconfig        |    7 ++
>  arch/arm/mach-gemini/Makefile       |    1 +
>  arch/arm/mach-gemini/board-wbd111.c |  143 +++++++++++++++++++++++++++++++++++
>  3 files changed, 151 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/mach-gemini/board-wbd111.c
>
> diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
> index 515b75c..4de67ce 100644
> --- a/arch/arm/mach-gemini/Kconfig
> +++ b/arch/arm/mach-gemini/Kconfig
> @@ -9,6 +9,13 @@ config MACH_RUT100
>  	  Say Y here if you intend to run this kernel on a
>  	  Teltonika 3G Router RUT100.
>+config MACH_WBD111
> +	bool "Wiliboard WBD-111"
> +	select GEMINI_MEM_SWAP
> +	help
> +	  Say Y here if you intend to run this kernel on a
> +	  Wiliboard WBD-111.
> +
>  endmenu
> config GEMINI_MEM_SWAP
> diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
> index 719505b..3997487 100644
> --- a/arch/arm/mach-gemini/Makefile
> +++ b/arch/arm/mach-gemini/Makefile
> @@ -8,3 +8,4 @@ obj-y			:= irq.o mm.o time.o devices.o gpio.o
> # Board-specific support
>  obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
> +obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
> diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
> new file mode 100644
> index 0000000..36538c1
> --- /dev/null
> +++ b/arch/arm/mach-gemini/board-wbd111.c
> @@ -0,0 +1,143 @@
> +/*
> + *  Support for Wiliboard WBD-111
> + *
> + *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/leds.h>
> +#include <linux/input.h>
> +#include <linux/skbuff.h>
> +#include <linux/gpio_keys.h>
> +#include <linux/mdio-gpio.h>
> +#include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/time.h>
> +
> +
> +#include "common.h"
> +
> +static struct gpio_keys_button wbd111_keys[] = {
> +	{
> +		.code		= KEY_SETUP,
> +		.gpio		= 5,
> +		.active_low	= 1,
> +		.desc		= "reset",
> +		.type		= EV_KEY,
> +	},
> +};
> +
> +static struct gpio_keys_platform_data wbd111_keys_data = {
> +	.buttons	= wbd111_keys,
> +	.nbuttons	= ARRAY_SIZE(wbd111_keys),
> +};
> +
> +static struct platform_device wbd111_keys_device = {
> +	.name	= "gpio-keys",
> +	.id	= -1,
> +	.dev	= {
> +		.platform_data = &wbd111_keys_data,
> +	},
> +};
> +
> +static struct gpio_led wbd111_leds[] = {
> +	{
> +		.name			= "L3red",
> +		.gpio			= 1,
> +	},
> +	{
> +		.name			= "L4green",
> +		.gpio			= 2,
> +	},
> +	{
> +		.name			= "L4red",
> +		.gpio			= 3,
> +	},
> +	{
> +		.name			= "L3green",
> +		.gpio			= 5,
> +	},
> +};
> +
> +static struct gpio_led_platform_data wbd111_leds_data = {
> +	.num_leds	= ARRAY_SIZE(wbd111_leds),
> +	.leds		= wbd111_leds,
> +};
> +
> +static struct platform_device wbd111_leds_device = {
> +	.name	= "leds-gpio",
> +	.id	= -1,
> +	.dev	= {
> +		.platform_data = &wbd111_leds_data,
> +	},
> +};
> +
> +static struct sys_timer wbd111_timer = {
> +	.init	= gemini_timer_init,
> +};
> +
> +#ifdef CONFIG_MTD_PARTITIONS
> +static struct mtd_partition wbd111_partitions[] = {
> +	{
> +		.name		= "RedBoot",
> +		.offset		= 0,
> +		.size		= 0x020000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "kernel",
> +		.offset		= 0x020000,
> +		.size		= 0x100000,
> +	} , {
> +		.name		= "rootfs",
> +		.offset		= 0x120000,
> +		.size		= 0x6a0000,
> +	} , {
> +		.name		= "VCTL",
> +		.offset		= 0x7c0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "cfg",
> +		.offset		= 0x7d0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "FIS",
> +		.offset		= 0x7e0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	}
> +};
> +#define wbd111_num_partitions	ARRAY_SIZE(wbd111_partitions)
> +#else
> +#define wbd111_partitions	NULL
> +#define wbd111_num_partitions	0
> +#endif /* CONFIG_MTD_PARTITIONS */
> +
> +static void __init wbd111_init(void)
> +{
> +	gemini_gpio_init();
> +	platform_register_uart();
> +	platform_register_pflash(SZ_8M, wbd111_partitions,
> +				 wbd111_num_partitions);
> +	platform_device_register(&wbd111_leds_device);
> +	platform_device_register(&wbd111_keys_device);
> +}
> +
> +MACHINE_START(WBD111, "Wiliboard WBD-111")
> +	.phys_io	= 0x7fffc000,
> +	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
> +	.boot_params	= 0x100,
> +	.map_io		= gemini_map_io,
> +	.init_irq	= gemini_init_irq,
> +	.timer		= &wbd111_timer,
> +	.init_machine	= wbd111_init,
> +MACHINE_END

[PATCH 2/4] ARM: Gemini: add support for Wiliboard WBD-222

[Imre Kaloz]

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

On Mon, 10 May 2010 22:06:59 +0200, Hans Ulli Kroll <ulli.kroll@googlemail.com> wrote:

> From: Imre Kaloz <kaloz@openwrt.org>
>
> Add support for Wiliboard WBD-222.
>
> Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> ---
>  arch/arm/mach-gemini/Kconfig        |    7 ++
>  arch/arm/mach-gemini/Makefile       |    1 +
>  arch/arm/mach-gemini/board-wbd222.c |  143 +++++++++++++++++++++++++++++++++++
>  3 files changed, 151 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/mach-gemini/board-wbd222.c
>
> diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
> index 4de67ce..7997500 100644
> --- a/arch/arm/mach-gemini/Kconfig
> +++ b/arch/arm/mach-gemini/Kconfig
> @@ -16,6 +16,13 @@ config MACH_WBD111
>  	  Say Y here if you intend to run this kernel on a
>  	  Wiliboard WBD-111.
>+config MACH_WBD222
> +        bool "Wiliboard WBD-222"
> +        select GEMINI_MEM_SWAP
> +        help
> +          Say Y here if you intend to run this kernel on a
> +          Wiliboard WBD-222.
> +
>  endmenu
> config GEMINI_MEM_SWAP
> diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
> index 3997487..8e02c47 100644
> --- a/arch/arm/mach-gemini/Makefile
> +++ b/arch/arm/mach-gemini/Makefile
> @@ -9,3 +9,4 @@ obj-y			:= irq.o mm.o time.o devices.o gpio.o
>  # Board-specific support
>  obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
>  obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
> +obj-$(CONFIG_MACH_WBD222)	+= board-wbd222.o
> diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
> new file mode 100644
> index 0000000..ece8b4c
> --- /dev/null
> +++ b/arch/arm/mach-gemini/board-wbd222.c
> @@ -0,0 +1,143 @@
> +/*
> + *  Support for Wiliboard WBD-222
> + *
> + *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/leds.h>
> +#include <linux/input.h>
> +#include <linux/skbuff.h>
> +#include <linux/gpio_keys.h>
> +#include <linux/mdio-gpio.h>
> +#include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/time.h>
> +
> +
> +#include "common.h"
> +
> +static struct gpio_keys_button wbd222_keys[] = {
> +	{
> +		.code		= KEY_SETUP,
> +		.gpio		= 5,
> +		.active_low	= 1,
> +		.desc		= "reset",
> +		.type		= EV_KEY,
> +	},
> +};
> +
> +static struct gpio_keys_platform_data wbd222_keys_data = {
> +	.buttons	= wbd222_keys,
> +	.nbuttons	= ARRAY_SIZE(wbd222_keys),
> +};
> +
> +static struct platform_device wbd222_keys_device = {
> +	.name	= "gpio-keys",
> +	.id	= -1,
> +	.dev	= {
> +		.platform_data = &wbd222_keys_data,
> +	},
> +};
> +
> +static struct gpio_led wbd222_leds[] = {
> +	{
> +		.name			= "L3red",
> +		.gpio			= 1,
> +	},
> +	{
> +		.name			= "L4green",
> +		.gpio			= 2,
> +	},
> +	{
> +		.name			= "L4red",
> +		.gpio			= 3,
> +	},
> +	{
> +		.name			= "L3green",
> +		.gpio			= 5,
> +	},
> +};
> +
> +static struct gpio_led_platform_data wbd222_leds_data = {
> +	.num_leds	= ARRAY_SIZE(wbd222_leds),
> +	.leds		= wbd222_leds,
> +};
> +
> +static struct platform_device wbd222_leds_device = {
> +	.name	= "leds-gpio",
> +	.id	= -1,
> +	.dev	= {
> +		.platform_data = &wbd222_leds_data,
> +	},
> +};
> +
> +static struct sys_timer wbd222_timer = {
> +	.init	= gemini_timer_init,
> +};
> +
> +#ifdef CONFIG_MTD_PARTITIONS
> +static struct mtd_partition wbd222_partitions[] = {
> +	{
> +		.name		= "RedBoot",
> +		.offset		= 0,
> +		.size		= 0x020000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "kernel",
> +		.offset		= 0x020000,
> +		.size		= 0x100000,
> +	} , {
> +		.name		= "rootfs",
> +		.offset		= 0x120000,
> +		.size		= 0x6a0000,
> +	} , {
> +		.name		= "VCTL",
> +		.offset		= 0x7c0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "cfg",
> +		.offset		= 0x7d0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	} , {
> +		.name		= "FIS",
> +		.offset		= 0x7e0000,
> +		.size		= 0x010000,
> +		.mask_flags	= MTD_WRITEABLE,
> +	}
> +};
> +#define wbd222_num_partitions	ARRAY_SIZE(wbd222_partitions)
> +#else
> +#define wbd222_partitions	NULL
> +#define wbd222_num_partitions	0
> +#endif /* CONFIG_MTD_PARTITIONS */
> +
> +static void __init wbd222_init(void)
> +{
> +	gemini_gpio_init();
> +	platform_register_uart();
> +	platform_register_pflash(SZ_8M, wbd222_partitions,
> +		wbd222_num_partitions);
> +	platform_device_register(&wbd222_leds_device);
> +	platform_device_register(&wbd222_keys_device);
> +}
> +
> +MACHINE_START(WBD222, "Wiliboard WBD-222")
> +	.phys_io	= 0x7fffc000,
> +	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
> +	.boot_params	= 0x100,
> +	.map_io		= gemini_map_io,
> +	.init_irq	= gemini_init_irq,
> +	.timer		= &wbd222_timer,
> +	.init_machine	= wbd222_init,
> +MACHINE_END

[PATCH 4/4] MAINTAINERS: update for ARM/Gemini

[Paulius Zaleckas]

On 05/10/2010 11:07 PM, Hans Ulli Kroll wrote:
> Signed-off-by: Hans Ulli Kroll<ulli.kroll@googlemail.com>

Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>

> ---
>   MAINTAINERS |   11 ++++++-----
>   1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 449d444..8a0fe7f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -620,10 +620,10 @@ M:	Richard Purdie<rpurdie@rpsys.net>
>   S:	Maintained
>
>   ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
> -M:	Paulius Zaleckas<paulius.zaleckas@gmail.com>
> +M:	Hans Ulli Kroll<ulli.kroll@googlemail.com>
>   L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> -T:	git git://gitorious.org/linux-gemini/mainline.git
> -S:	Odd Fixes
> +T:	git git://git.berlios.de/gemini-board
> +S:	Maintained
>   F:	arch/arm/mach-gemini/
>
>   ARM/EBSA110 MACHINE SUPPORT
> @@ -645,9 +645,10 @@ T:	topgit git://git.openezx.org/openezx.git
>   F:	arch/arm/mach-pxa/ezx.c
>
>   ARM/FARADAY FA526 PORT
> -M:	Paulius Zaleckas<paulius.zaleckas@gmail.com>
> +M:	Hans Ulli Kroll<ulli.kroll@googlemail.com>
>   L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> -S:	Odd Fixes
> +S:	Maintained
> +T:	git://git.berlios.de/gemini-board
>   F:	arch/arm/mm/*-fa*
>
>   ARM/FOOTBRIDGE ARCHITECTURE

[PATCH 3/4] ARM: Gemini: add support for Raidsonic IB4220

[Janos Laube]

Signed-off-by: Janos Laube <janos.dev@gmail.com>

On Mon, May 10, 2010 at 10:07 PM, Hans Ulli Kroll
<ulli.kroll@googlemail.com> wrote:
> From: Janos Laube <janos.dev@gmail.com>
>
> Add support for Nasbox IB4220 from Raidsonic.
>
> Signed-off-by: Janos Laube <janos.dev@gmail.com>
> Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> ---
> ?arch/arm/mach-gemini/Kconfig ? ? ? ? ?| ? ?7 ++
> ?arch/arm/mach-gemini/Makefile ? ? ? ? | ? ?1 +
> ?arch/arm/mach-gemini/board-nas4220b.c | ?111 +++++++++++++++++++++++++++++++++
> ?3 files changed, 119 insertions(+), 0 deletions(-)
> ?create mode 100644 arch/arm/mach-gemini/board-nas4220b.c
>
> diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig
> index 7997500..6f066ee 100644
> --- a/arch/arm/mach-gemini/Kconfig
> +++ b/arch/arm/mach-gemini/Kconfig
> @@ -2,6 +2,13 @@ if ARCH_GEMINI
>
> ?menu "Cortina Systems Gemini Implementations"
>
> +config MACH_NAS4220B
> + ? ? ? bool "Raidsonic NAS-4220-B"
> + ? ? ? select GEMINI_MEM_SWAP
> + ? ? ? help
> + ? ? ? ? Say Y here if you intend to run this kernel on a
> + ? ? ? ? Raidsonic NAS-4220-B.
> +
> ?config MACH_RUT100
> ? ? ? ?bool "Teltonika RUT100"
> ? ? ? ?select GEMINI_MEM_SWAP
> diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
> index 8e02c47..c5b24b9 100644
> --- a/arch/arm/mach-gemini/Makefile
> +++ b/arch/arm/mach-gemini/Makefile
> @@ -7,6 +7,7 @@
> ?obj-y ? ? ? ? ? ? ? ? ?:= irq.o mm.o time.o devices.o gpio.o
>
> ?# Board-specific support
> +obj-$(CONFIG_MACH_NAS4220B) ? ?+= board-nas4220b.o
> ?obj-$(CONFIG_MACH_RUT100) ? ? ?+= board-rut1xx.o
> ?obj-$(CONFIG_MACH_WBD111) ? ? ?+= board-wbd111.o
> ?obj-$(CONFIG_MACH_WBD222) ? ? ?+= board-wbd222.o
> diff --git a/arch/arm/mach-gemini/board-nas4220b.c b/arch/arm/mach-gemini/board-nas4220b.c
> new file mode 100644
> index 0000000..01f1d6d
> --- /dev/null
> +++ b/arch/arm/mach-gemini/board-nas4220b.c
> @@ -0,0 +1,111 @@
> +/*
> + * ?Support for Raidsonic NAS-4220-B
> + *
> + * ?Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
> + *
> + * based on rut1xx.c
> + * ?Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/leds.h>
> +#include <linux/input.h>
> +#include <linux/gpio_keys.h>
> +#include <linux/mdio-gpio.h>
> +#include <linux/io.h>
> +
> +#include <asm/setup.h>
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/time.h>
> +
> +#include <mach/hardware.h>
> +#include <mach/global_reg.h>
> +
> +#include "common.h"
> +
> +static struct sys_timer ib4220b_timer = {
> + ? ? ? .init ? = gemini_timer_init,
> +};
> +
> +static struct gpio_led ib4220b_leds[] = {
> + ? ? ? {
> + ? ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "nas4220b:orange:hdd",
> + ? ? ? ? ? ? ? .default_trigger ? ? ? ?= "none",
> + ? ? ? ? ? ? ? .gpio ? ? ? ? ? ? ? ? ? = 60,
> + ? ? ? },
> + ? ? ? {
> + ? ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "nas4220b:green:os",
> + ? ? ? ? ? ? ? .default_trigger ? ? ? ?= "heartbeat",
> + ? ? ? ? ? ? ? .gpio ? ? ? ? ? ? ? ? ? = 62,
> + ? ? ? },
> +};
> +
> +static struct gpio_led_platform_data ib4220b_leds_data = {
> + ? ? ? .num_leds ? ? ? = ARRAY_SIZE(ib4220b_leds),
> + ? ? ? .leds ? ? ? ? ? = ib4220b_leds,
> +};
> +
> +static struct platform_device ib4220b_led_device = {
> + ? ? ? .name ? = "leds-gpio",
> + ? ? ? .id ? ? = -1,
> + ? ? ? .dev ? ?= {
> + ? ? ? ? ? ? ? .platform_data = &ib4220b_leds_data,
> + ? ? ? },
> +};
> +
> +static struct gpio_keys_button ib4220b_keys[] = {
> + ? ? ? {
> + ? ? ? ? ? ? ? .code ? ? ? ? ? = KEY_SETUP,
> + ? ? ? ? ? ? ? .gpio ? ? ? ? ? = 61,
> + ? ? ? ? ? ? ? .active_low ? ? = 1,
> + ? ? ? ? ? ? ? .desc ? ? ? ? ? = "Backup Button",
> + ? ? ? ? ? ? ? .type ? ? ? ? ? = EV_KEY,
> + ? ? ? },
> + ? ? ? {
> + ? ? ? ? ? ? ? .code ? ? ? ? ? = KEY_RESTART,
> + ? ? ? ? ? ? ? .gpio ? ? ? ? ? = 63,
> + ? ? ? ? ? ? ? .active_low ? ? = 1,
> + ? ? ? ? ? ? ? .desc ? ? ? ? ? = "Softreset Button",
> + ? ? ? ? ? ? ? .type ? ? ? ? ? = EV_KEY,
> + ? ? ? },
> +};
> +
> +static struct gpio_keys_platform_data ib4220b_keys_data = {
> + ? ? ? .buttons ? ? ? ?= ib4220b_keys,
> + ? ? ? .nbuttons ? ? ? = ARRAY_SIZE(ib4220b_keys),
> +};
> +
> +static struct platform_device ib4220b_key_device = {
> + ? ? ? .name ? = "gpio-keys",
> + ? ? ? .id ? ? = -1,
> + ? ? ? .dev ? ?= {
> + ? ? ? ? ? ? ? .platform_data = &ib4220b_keys_data,
> + ? ? ? },
> +};
> +
> +static void __init ib4220b_init(void)
> +{
> + ? ? ? gemini_gpio_init();
> + ? ? ? platform_register_uart();
> + ? ? ? platform_register_pflash(SZ_16M, NULL, 0);
> + ? ? ? platform_device_register(&ib4220b_led_device);
> + ? ? ? platform_device_register(&ib4220b_key_device);
> +}
> +
> +MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B")
> + ? ? ? .phys_io ? ? ? ?= 0x7fffc000,
> + ? ? ? .io_pg_offst ? ?= ((0xffffc000) >> 18) & 0xfffc,
> + ? ? ? .boot_params ? ?= 0x100,
> + ? ? ? .map_io ? ? ? ? = gemini_map_io,
> + ? ? ? .init_irq ? ? ? = gemini_init_irq,
> + ? ? ? .timer ? ? ? ? ?= &ib4220b_timer,
> + ? ? ? .init_machine ? = ib4220b_init,
> +MACHINE_END
> --
> 1.7.0.3
>
>