8 files changed, 408 insertions, 3 deletions

diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig
index af7ead33c6dd..af3b40c0508a 100644
--- a/arch/arm/configs/iop32x_defconfig
+++ b/arch/arm/configs/iop32x_defconfig
@@ -128,6 +128,7 @@ CONFIG_ARCH_IOP32X=y
 #
 CONFIG_ARCH_IQ80321=y
 CONFIG_ARCH_IQ31244=y
+CONFIG_MACH_N2100=y
 CONFIG_PLAT_IOP=y
 
 #
@@ -601,7 +602,8 @@ CONFIG_E1000_NAPI=y
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
@@ -897,13 +899,126 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+
+#
+# USB DSL modem support
+#
+
+#
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
diff --git a/arch/arm/mach-iop32x/Kconfig b/arch/arm/mach-iop32x/Kconfig
index d7abfaa525c3..0a397a4a6ac9 100644
--- a/arch/arm/mach-iop32x/Kconfig
+++ b/arch/arm/mach-iop32x/Kconfig
@@ -17,6 +17,12 @@ config ARCH_IQ31244
           evaluation kit for the Intel 80219 processor (a IOP321 variant)
           or the IQ31244 evaluation kit for the IOP321 processor.
 
+config MACH_N2100
+        bool "Enable support for the Thecus n2100"
+        help
+          Say Y here if you want to run your kernel on the Thecus n2100
+          NAS appliance.
+
 endmenu
 
 endif
diff --git a/arch/arm/mach-iop32x/Makefile b/arch/arm/mach-iop32x/Makefile
index af1747ae392d..9c62470cd4f5 100644
--- a/arch/arm/mach-iop32x/Makefile
+++ b/arch/arm/mach-iop32x/Makefile
@@ -9,3 +9,4 @@ obj-			:=
 
 obj-$(CONFIG_ARCH_IQ80321) += iq80321.o
 obj-$(CONFIG_ARCH_IQ31244) += iq31244.o
+obj-$(CONFIG_MACH_N2100) += n2100.o
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c
index 21294be5a369..17fb94e6e29f 100644
--- a/arch/arm/mach-iop32x/irq.c
+++ b/arch/arm/mach-iop32x/irq.c
@@ -63,7 +63,8 @@ void __init iop32x_init_irq(void)
         intctl_write(0);
         intstr_write(0);
         if (machine_is_iq80321() ||
-            machine_is_iq31244())
+            machine_is_iq31244() ||
+            machine_is_n2100())
                 *IOP3XX_PCIIRSR = 0x0f;
 
         for (i = 0; i < NR_IRQS; i++) {
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
new file mode 100644
index 000000000000..a2c94a47b2b2
--- /dev/null
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -0,0 +1,251 @@
+/*
+ * arch/arm/mach-iop32x/n2100.c
+ *
+ * Board support code for the Thecus N2100 platform.
+ *
+ * Author: Rory Bolt <rorybolt@pacbell.net>
+ * Copyright (C) 2002 Rory Bolt
+ * Copyright 2003 (c) MontaVista, Software, Inc.
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * 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/mm.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <linux/reboot.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/pci.h>
+#include <asm/mach/time.h>
+#include <asm/mach-types.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+/*
+ * N2100 timer tick configuration.
+ */
+static void __init n2100_timer_init(void)
+{
+        /* 33.000 MHz crystal.  */
+        iop3xx_init_time(198000000);
+}
+
+static struct sys_timer n2100_timer = {
+        .init           = n2100_timer_init,
+        .offset         = iop3xx_gettimeoffset,
+};
+
+
+/*
+ * N2100 I/O.
+ */
+static struct map_desc n2100_io_desc[] __initdata = {
+        {       /* on-board devices */
+                .virtual        = N2100_UART,
+                .pfn            = __phys_to_pfn(N2100_UART),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        },
+};
+
+void __init n2100_map_io(void)
+{
+        iop3xx_map_io();
+        iotable_init(n2100_io_desc, ARRAY_SIZE(n2100_io_desc));
+}
+
+
+/*
+ * N2100 PCI.
+ */
+static inline int __init
+n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int irq;
+
+        if (PCI_SLOT(dev->devfn) == 1) {
+                /* RTL8110SB #1 */
+                irq = IRQ_IOP32X_XINT0;
+        } else if (PCI_SLOT(dev->devfn) == 2) {
+                /* RTL8110SB #2 */
+                irq = IRQ_IOP32X_XINT1;
+        } else if (PCI_SLOT(dev->devfn) == 3) {
+                /* Sil3512 */
+                irq = IRQ_IOP32X_XINT2;
+        } else if (PCI_SLOT(dev->devfn) == 4 && pin == 1) {
+                /* VT6212 INTA */
+                irq = IRQ_IOP32X_XINT1;
+        } else if (PCI_SLOT(dev->devfn) == 4 && pin == 2) {
+                /* VT6212 INTB */
+                irq = IRQ_IOP32X_XINT0;
+        } else if (PCI_SLOT(dev->devfn) == 4 && pin == 3) {
+                /* VT6212 INTC */
+                irq = IRQ_IOP32X_XINT2;
+        } else if (PCI_SLOT(dev->devfn) == 5) {
+                /* Mini-PCI slot */
+                irq = IRQ_IOP32X_XINT3;
+        } else {
+                printk(KERN_ERR "n2100_pci_map_irq() called for unknown "
+                        "device PCI:%d:%d:%d\n", dev->bus->number,
+                        PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+                irq = -1;
+        }
+
+        return irq;
+}
+
+static struct hw_pci n2100_pci __initdata = {
+        .swizzle        = pci_std_swizzle,
+        .nr_controllers = 1,
+        .setup          = iop3xx_pci_setup,
+        .preinit        = iop3xx_pci_preinit,
+        .scan           = iop3xx_pci_scan_bus,
+        .map_irq        = n2100_pci_map_irq,
+};
+
+static int __init n2100_pci_init(void)
+{
+        if (machine_is_n2100())
+                pci_common_init(&n2100_pci);
+
+        return 0;
+}
+
+subsys_initcall(n2100_pci_init);
+
+
+/*
+ * N2100 machine initialisation.
+ */
+static struct physmap_flash_data n2100_flash_data = {
+        .width          = 2,
+};
+
+static struct resource n2100_flash_resource = {
+        .start          = 0xf0000000,
+        .end            = 0xf0ffffff,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device n2100_flash_device = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &n2100_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &n2100_flash_resource,
+};
+
+
+static struct plat_serial8250_port n2100_serial_port[] = {
+        {
+                .mapbase        = N2100_UART,
+                .membase        = (char *)N2100_UART,
+                .irq            = 0,
+                .flags          = UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 0,
+                .uartclk        = 1843200,
+        },
+        { },
+};
+
+static struct resource n2100_uart_resource = {
+        .start          = N2100_UART,
+        .end            = N2100_UART + 7,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device n2100_serial_device = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM,
+        .dev            = {
+                .platform_data          = n2100_serial_port,
+        },
+        .num_resources  = 1,
+        .resource       = &n2100_uart_resource,
+};
+
+
+/*
+ * Pull PCA9532 GPIO #8 low to power off the machine.
+ */
+static void n2100_power_off(void)
+{
+        local_irq_disable();
+
+        /* Start condition, I2C address of PCA9532, write transaction.  */
+        *IOP3XX_IDBR0 = 0xc0;
+        *IOP3XX_ICR0 = 0xe9;
+        mdelay(1);
+
+        /* Write address 0x08.  */
+        *IOP3XX_IDBR0 = 0x08;
+        *IOP3XX_ICR0 = 0xe8;
+        mdelay(1);
+
+        /* Write data 0x01, stop condition.  */
+        *IOP3XX_IDBR0 = 0x01;
+        *IOP3XX_ICR0 = 0xea;
+
+        while (1)
+                ;
+}
+
+
+static struct timer_list power_button_poll_timer;
+
+static void power_button_poll(unsigned long dummy)
+{
+        if (gpio_line_get(N2100_POWER_BUTTON) == 0) {
+                ctrl_alt_del();
+                return;
+        }
+
+        power_button_poll_timer.expires = jiffies + (HZ / 10);
+        add_timer(&power_button_poll_timer);
+}
+
+
+static void __init n2100_init_machine(void)
+{
+        platform_device_register(&iop3xx_i2c0_device);
+        platform_device_register(&n2100_flash_device);
+        platform_device_register(&n2100_serial_device);
+
+        pm_power_off = n2100_power_off;
+
+        init_timer(&power_button_poll_timer);
+        power_button_poll_timer.function = power_button_poll;
+        power_button_poll_timer.expires = jiffies + (HZ / 10);
+        add_timer(&power_button_poll_timer);
+}
+
+MACHINE_START(N2100, "Thecus N2100")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+        .phys_io        = N2100_UART,
+        .io_pg_offst    = ((N2100_UART) >> 18) & 0xfffc,
+        .boot_params    = 0xa0000100,
+        .map_io         = n2100_map_io,
+        .init_irq       = iop32x_init_irq,
+        .timer          = &n2100_timer,
+        .init_machine   = n2100_init_machine,
+MACHINE_END
diff --git a/include/asm-arm/arch-iop32x/hardware.h b/include/asm-arm/arch-iop32x/hardware.h
index 6a3001f2f7e0..c6f58b91ddbc 100644
--- a/include/asm-arm/arch-iop32x/hardware.h
+++ b/include/asm-arm/arch-iop32x/hardware.h
@@ -37,6 +37,7 @@ void iop32x_init_irq(void);
  */
 #include "iq80321.h"
 #include "iq31244.h"
+#include "n2100.h"
 
 
 #endif
diff --git a/include/asm-arm/arch-iop32x/n2100.h b/include/asm-arm/arch-iop32x/n2100.h
new file mode 100644
index 000000000000..fed31a648425
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/n2100.h
@@ -0,0 +1,19 @@
+/*
+ * include/asm/arch-iop32x/n2100.h
+ *
+ * Thecus N2100 board registers
+ */
+
+#ifndef __N2100_H
+#define __N2100_H
+
+#define N2100_UART              0xfe800000      /* UART */
+
+#define N2100_COPY_BUTTON       IOP3XX_GPIO_LINE(0)
+#define N2100_PCA9532_RESET     IOP3XX_GPIO_LINE(2)
+#define N2100_RESET_BUTTON      IOP3XX_GPIO_LINE(3)
+#define N2100_HARDWARE_RESET    IOP3XX_GPIO_LINE(4)
+#define N2100_POWER_BUTTON      IOP3XX_GPIO_LINE(5)
+
+
+#endif
diff --git a/include/asm-arm/arch-iop32x/system.h b/include/asm-arm/arch-iop32x/system.h
index c65ede3e627a..17b7eb7e9c0d 100644
--- a/include/asm-arm/arch-iop32x/system.h
+++ b/include/asm-arm/arch-iop32x/system.h
@@ -8,6 +8,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <asm/mach-types.h>
+
 static inline void arch_idle(void)
 {
         cpu_do_idle();
@@ -15,6 +17,15 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
+        local_irq_disable();
+
+        if (machine_is_n2100()) {
+                gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
+                gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
+                while (1)
+                        ;
+        }
+
         *IOP3XX_PCSR = 0x30;
 
         /* Jump into ROM at address 0 */