Imre Kaloz
13 years ago
parent
a3989e3dbd
commit
b84d1996ba
@ -0,0 +1,30 @@
|
||||
--- a/arch/arm/mach-gemini/board-nas4220b.c
|
||||
+++ b/arch/arm/mach-gemini/board-nas4220b.c
|
||||
@@ -95,6 +95,7 @@ static void __init ib4220b_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_16M, NULL, 0);
|
||||
platform_device_register(&ib4220b_led_device);
|
||||
platform_device_register(&ib4220b_key_device);
|
||||
--- a/arch/arm/mach-gemini/board-wbd111.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -126,6 +126,7 @@ static void __init wbd111_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_8M, wbd111_partitions,
|
||||
wbd111_num_partitions);
|
||||
platform_device_register(&wbd111_leds_device);
|
||||
--- a/arch/arm/mach-gemini/board-wbd222.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd222.c
|
||||
@@ -126,6 +126,7 @@ static void __init wbd222_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_8M, wbd222_partitions,
|
||||
wbd222_num_partitions);
|
||||
platform_device_register(&wbd222_leds_device);
|
||||
@ -1,151 +0,0 @@
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -0,0 +1,125 @@
|
||||
+/*
|
||||
+ * 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 <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/time.h>
|
||||
+
|
||||
+#include <mach/gmac.h>
|
||||
+
|
||||
+#include "common.h"
|
||||
+
|
||||
+static struct mdio_gpio_platform_data wbd111_mdio = {
|
||||
+ .mdc = 22,
|
||||
+ .mdio = 21,
|
||||
+ .phy_mask = ~(1 << 1),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wbd111_phy_device = {
|
||||
+ .name = "mdio-gpio",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wbd111_mdio,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct gemini_gmac_platform_data gmac_data = {
|
||||
+ .bus_id[0] = "0:01",
|
||||
+ .interface[0] = PHY_INTERFACE_MODE_MII,
|
||||
+};
|
||||
+
|
||||
+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,
|
||||
+};
|
||||
+
|
||||
+static void __init wbd111_init(void)
|
||||
+{
|
||||
+ gemini_gpio_init();
|
||||
+ platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
+ platform_register_pflash(SZ_8M, NULL, 0);
|
||||
+ platform_device_register(&wbd111_leds_device);
|
||||
+ platform_device_register(&wbd111_keys_device);
|
||||
+ platform_device_register(&wbd111_phy_device);
|
||||
+ platform_register_ethernet(&gmac_data);
|
||||
+}
|
||||
+
|
||||
+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
|
||||
--- a/arch/arm/mach-gemini/Kconfig
|
||||
+++ b/arch/arm/mach-gemini/Kconfig
|
||||
@@ -16,6 +16,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
|
||||
--- a/arch/arm/mach-gemini/Makefile
|
||||
+++ b/arch/arm/mach-gemini/Makefile
|
||||
@@ -11,3 +11,4 @@ obj-$(CONFIG_PCI) += pci.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
|
||||
@ -1,64 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/board-wbd111.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -16,6 +16,8 @@
|
||||
#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>
|
||||
@@ -102,12 +104,51 @@ 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_watchdog();
|
||||
- platform_register_pflash(SZ_8M, NULL, 0);
|
||||
+ platform_register_pflash(SZ_8M, wbd111_partitions,
|
||||
+ wbd111_num_partitions);
|
||||
platform_device_register(&wbd111_leds_device);
|
||||
platform_device_register(&wbd111_keys_device);
|
||||
platform_device_register(&wbd111_phy_device);
|
||||
@ -1,196 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/Kconfig
|
||||
+++ b/arch/arm/mach-gemini/Kconfig
|
||||
@@ -23,6 +23,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
|
||||
--- a/arch/arm/mach-gemini/Makefile
|
||||
+++ b/arch/arm/mach-gemini/Makefile
|
||||
@@ -12,3 +12,4 @@ obj-$(CONFIG_PCI) += pci.o
|
||||
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
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-gemini/board-wbd222.c
|
||||
@@ -0,0 +1,170 @@
|
||||
+/*
|
||||
+ * 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 <mach/gmac.h>
|
||||
+
|
||||
+#include "common.h"
|
||||
+
|
||||
+static struct mdio_gpio_platform_data wbd222_mdio = {
|
||||
+ .mdc = 22,
|
||||
+ .mdio = 21,
|
||||
+ .phy_mask = ~((1 << 1) | (1 << 3)),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wbd222_phy_device = {
|
||||
+ .name = "mdio-gpio",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wbd222_mdio,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct gemini_gmac_platform_data gmac_data = {
|
||||
+ .bus_id[0] = "0:01",
|
||||
+ .interface[0] = PHY_INTERFACE_MODE_MII,
|
||||
+ .bus_id[1] = "0:03",
|
||||
+ .interface[1] = PHY_INTERFACE_MODE_MII,
|
||||
+};
|
||||
+
|
||||
+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_watchdog();
|
||||
+ platform_register_pflash(SZ_8M, wbd222_partitions,
|
||||
+ wbd222_num_partitions);
|
||||
+ platform_device_register(&wbd222_leds_device);
|
||||
+ platform_device_register(&wbd222_keys_device);
|
||||
+ platform_device_register(&wbd222_phy_device);
|
||||
+ platform_register_ethernet(&gmac_data);
|
||||
+ platform_register_usb(0);
|
||||
+ platform_register_usb(1);
|
||||
+}
|
||||
+
|
||||
+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
|
||||
Loading…
Reference in New Issue