3 files changed, 376 insertions, 0 deletions

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index ff405c47490f..c738f450f936 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -36,6 +36,12 @@ config MACH_TS209
           Say 'Y' here if you want your kernel to support the
           QNAP TS-109/TS-209 platform.
 
+config MACH_TERASTATION_PRO2
+        bool "Buffalo Terastation Pro II/Live"
+        help
+          Say 'Y' here if you want your kernel to support the
+          Buffalo Terastation Pro II/Live platform.
+
 config MACH_LINKSTATION_PRO
         bool "Buffalo Linkstation Pro/Live"
         select I2C_BOARDINFO
diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
index b6da94bdb3f7..39e41a6b61e1 100644
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -2,6 +2,7 @@ obj-y				+= common.o addr-map.o pci.o gpio.o irq.o mpp.o
 obj-$(CONFIG_MACH_DB88F5281)    += db88f5281-setup.o
 obj-$(CONFIG_MACH_RD88F5182)    += rd88f5182-setup.o
 obj-$(CONFIG_MACH_KUROBOX_PRO)  += kurobox_pro-setup.o
+obj-$(CONFIG_MACH_TERASTATION_PRO2)     += terastation_pro2-setup.o
 obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o
 obj-$(CONFIG_MACH_DNS323)       += dns323-setup.o
 obj-$(CONFIG_MACH_TS209)        += ts209-setup.o tsx09-common.o
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
new file mode 100644
index 000000000000..0b101d7d41c2
--- /dev/null
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -0,0 +1,369 @@
+/*
+ * Buffalo Terastation Pro II/Live Board Setup
+ *
+ * Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com>
+ *
+ * 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/pci.h>
+#include <linux/irq.h>
+#include <linux/delay.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/i2c.h>
+#include <linux/serial_reg.h>
+#include <asm/mach-types.h>
+#include <asm/gpio.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/pci.h>
+#include <mach/orion5x.h>
+#include "common.h"
+#include "mpp.h"
+
+/*****************************************************************************
+ * Terastation Pro 2/Live Info
+ ****************************************************************************/
+
+/*
+ * Terastation Pro 2 hardware :
+ * - Marvell 88F5281-D0
+ * - Marvell 88SX6042 SATA controller (PCI)
+ * - Marvell 88E1118 Gigabit Ethernet PHY
+ * - 256KB NOR flash
+ * - 128MB of DDR RAM
+ * - PCIe port (not equipped)
+ */
+
+/*
+ * 256K NOR flash Device bus boot chip select
+ */
+
+#define TSP2_NOR_BOOT_BASE      0xf4000000
+#define TSP2_NOR_BOOT_SIZE      SZ_256K
+
+/*****************************************************************************
+ * 256KB NOR Flash on BOOT Device
+ ****************************************************************************/
+
+static struct physmap_flash_data tsp2_nor_flash_data = {
+        .width    = 1,
+};
+
+static struct resource tsp2_nor_flash_resource = {
+        .flags = IORESOURCE_MEM,
+        .start = TSP2_NOR_BOOT_BASE,
+        .end   = TSP2_NOR_BOOT_BASE + TSP2_NOR_BOOT_SIZE - 1,
+};
+
+static struct platform_device tsp2_nor_flash = {
+        .name          = "physmap-flash",
+        .id            = 0,
+        .dev           = {
+                .platform_data  = &tsp2_nor_flash_data,
+        },
+        .num_resources = 1,
+        .resource      = &tsp2_nor_flash_resource,
+};
+
+/*****************************************************************************
+ * PCI
+ ****************************************************************************/
+#define TSP2_PCI_SLOT0_OFFS             7
+#define TSP2_PCI_SLOT0_IRQ_PIN          11
+
+void __init tsp2_pci_preinit(void)
+{
+        int pin;
+
+        /*
+         * Configure PCI GPIO IRQ pins
+         */
+        pin = TSP2_PCI_SLOT0_IRQ_PIN;
+        if (gpio_request(pin, "PCI Int1") == 0) {
+                if (gpio_direction_input(pin) == 0) {
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
+                } else {
+                        printk(KERN_ERR "tsp2_pci_preinit failed "
+                                        "to set_irq_type pin %d\n", pin);
+                        gpio_free(pin);
+                }
+        } else {
+                printk(KERN_ERR "tsp2_pci_preinit failed to "
+                                "gpio_request %d\n", pin);
+        }
+}
+
+static int __init tsp2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int irq;
+
+        /*
+         * Check for devices with hard-wired IRQs.
+         */
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
+
+        /*
+         * PCI IRQs are connected via GPIOs.
+         */
+        if (slot == TSP2_PCI_SLOT0_OFFS)
+                return gpio_to_irq(TSP2_PCI_SLOT0_IRQ_PIN);
+
+        return -1;
+}
+
+static struct hw_pci tsp2_pci __initdata = {
+        .nr_controllers = 2,
+        .preinit        = tsp2_pci_preinit,
+        .swizzle        = pci_std_swizzle,
+        .setup          = orion5x_pci_sys_setup,
+        .scan           = orion5x_pci_sys_scan_bus,
+        .map_irq        = tsp2_pci_map_irq,
+};
+
+static int __init tsp2_pci_init(void)
+{
+        if (machine_is_terastation_pro2())
+                pci_common_init(&tsp2_pci);
+
+        return 0;
+}
+
+subsys_initcall(tsp2_pci_init);
+
+/*****************************************************************************
+ * Ethernet
+ ****************************************************************************/
+
+static struct mv643xx_eth_platform_data tsp2_eth_data = {
+        .phy_addr       = 0,
+};
+
+/*****************************************************************************
+ * RTC 5C372a on I2C bus
+ ****************************************************************************/
+
+#define TSP2_RTC_GPIO   9
+
+static struct i2c_board_info __initdata tsp2_i2c_rtc = {
+        I2C_BOARD_INFO("rs5c372a", 0x32),
+};