Merge branches 'gemini' and 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:13:54 +0000 (18:13 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:13:54 +0000 (18:13 +0100)
MAINTAINERS
arch/arm/mach-gemini/Kconfig
arch/arm/mach-gemini/Makefile
arch/arm/mach-gemini/board-nas4220b.c [new file with mode: 0644]
arch/arm/mach-gemini/board-wbd111.c [new file with mode: 0644]
arch/arm/mach-gemini/board-wbd222.c [new file with mode: 0644]

index 88ec044..9eb7713 100644 (file)
@@ -617,10 +617,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@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
@@ -642,9 +642,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@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
index 515b75c..6f066ee 100644 (file)
@@ -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
@@ -9,6 +16,20 @@ 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.
+
+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
index 719505b..c5b24b9 100644 (file)
@@ -7,4 +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 (file)
index 0000000..01f1d6d
--- /dev/null
@@ -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
diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
new file mode 100644 (file)
index 0000000..36538c1
--- /dev/null
@@ -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
diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
new file mode 100644 (file)
index 0000000..ece8b4c
--- /dev/null
@@ -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