ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net

This patch supplies the necessary DTS and supporting files to boot up
a Seagate GoFlex Net with 3.5.0-rc3.

Signed-off-by: Joshua Coombs <josh.coombs@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>

7 files changed, 224 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
new file mode 100644
index 000000000000..c5d5a4e9f11e
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -0,0 +1,49 @@
+/dts-v1/;
+
+/include/ "kirkwood.dtsi"
+
+/ {
+        model = "Seagate GoFlex Net";
+        compatible = "seagate,goflexnet", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x8000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "ok";
+                };
+
+                nand@3000000 {
+                        status = "okay";
+
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x400000>;
+                        };
+
+                        partition@500000 {
+                                label = "pogoplug";
+                                reg = <0x0500000 0x2000000>;
+                        };
+
+                        partition@2500000 {
+                                label = "root";
+                                reg = <0x02500000 0xd800000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 8e62fa745b98..cb636d05f4f3 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -94,6 +94,13 @@ config MACH_TS219_DT
           or MV6282. If you have the wrong one, the buttons will not
           work.
 
+config MACH_GOFLEXNET_DT
+        bool "Seagate GoFlex Net (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          Seagate GoFlex Net (Flattened Device Tree).
+
 config MACH_TS219
         bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
         help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 8b023281ec72..7153a24c3024 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o
 obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)    += board-dnskw.o
 obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
 obj-$(CONFIG_MACH_TS219_DT)             += board-ts219.o tsx1x-common.o
+obj-$(CONFIG_MACH_GOFLEXNET_DT)         += board-goflexnet.o
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
index 4a1f66a020b0..c6eba8f114a9 100644
--- a/arch/arm/mach-kirkwood/Makefile.boot
+++ b/arch/arm/mach-kirkwood/Makefile.boot
@@ -8,3 +8,4 @@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
 dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
 dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
 dtb-$(CONFIG_MACH_TS219_DT)     += kirkwood-qnap-ts219.dtb
+dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index d0ad25036558..87538182d3da 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -32,6 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
                        NULL),
         OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
         OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
+        OF_DEV_AUXDATA("mrvl,orion-nand", 0xf4000000, "orion_nand", NULL),
         {},
 };
 
@@ -80,6 +81,9 @@ static void __init kirkwood_dt_init(void)
         if (of_machine_is_compatible("qnap,ts219"))
                 qnap_dt_ts219_init();
 
+        if (of_machine_is_compatible("seagate,goflexnet"))
+                goflexnet_init();
+
         of_platform_populate(NULL, kirkwood_dt_match_table,
                              kirkwood_auxdata_lookup, NULL);
 }
@@ -91,6 +95,7 @@ static const char *kirkwood_dt_board_compat[] = {
         "iom,iconnect",
         "raidsonic,ib-nas62x0",
         "qnap,ts219",
+        "seagate,goflexnet",
         NULL
 };
 
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
new file mode 100644
index 000000000000..3957ece46d36
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
+ *
+ * arch/arm/mach-kirkwood/board-goflexnet.c
+ *
+ * Seagate GoFlext Net Board Init for drivers not converted to
+ * flattened device tree yet.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * Copied and modified for Seagate GoFlex Net support by
+ * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
+ * GoFlex kernel patches.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/kirkwood.h>
+#include <mach/bridge-regs.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
+};
+
+static struct mv_sata_platform_data goflexnet_sata_data = {
+        .n_ports        = 2,
+};
+
+static struct gpio_led goflexnet_led_pins[] = {
+        {
+                .name                   = "status:green:health",
+                .default_trigger        = "default-on",
+                .gpio                   = 46,
+                .active_low             = 1,
+        },
+        {
+                .name                   = "status:orange:fault",
+                .default_trigger        = "none",
+                .gpio                   = 47,
+                .active_low             = 1,
+        },
+        {
+                .name                   = "status:white:left0",
+                .default_trigger        = "none",
+                .gpio                   = 42,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:left1",
+                .default_trigger        = "none",
+                .gpio                   = 43,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:left2",
+                .default_trigger        = "none",
+                .gpio                   = 44,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:left3",
+                .default_trigger        = "none",
+                .gpio                   = 45,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:right0",
+                .default_trigger        = "none",
+                .gpio                   = 38,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:right1",
+                .default_trigger        = "none",
+                .gpio                   = 39,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:right2",
+                .default_trigger        = "none",
+                .gpio                   = 40,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "status:white:right3",
+                .default_trigger        = "none",
+                .gpio                   = 41,
+                .active_low             = 0,
+        },
+};
+
+static struct gpio_led_platform_data goflexnet_led_data = {
+        .leds           = goflexnet_led_pins,
+        .num_leds       = ARRAY_SIZE(goflexnet_led_pins),
+};
+
+static struct platform_device goflexnet_leds = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &goflexnet_led_data,
+        }
+};
+
+static unsigned int goflexnet_mpp_config[] __initdata = {
+        MPP29_GPIO,     /* USB Power Enable */
+        MPP47_GPIO,     /* LED Orange */
+        MPP46_GPIO,     /* LED Green */
+        MPP45_GPIO,     /* LED Left Capacity 3 */
+        MPP44_GPIO,     /* LED Left Capacity 2 */
+        MPP43_GPIO,     /* LED Left Capacity 1 */
+        MPP42_GPIO,     /* LED Left Capacity 0 */
+        MPP41_GPIO,     /* LED Right Capacity 3 */
+        MPP40_GPIO,     /* LED Right Capacity 2 */
+        MPP39_GPIO,     /* LED Right Capacity 1 */
+        MPP38_GPIO,     /* LED Right Capacity 0 */
+        0
+};
+
+void __init goflexnet_init(void)
+{
+        /*
+         * Basic setup. Needs to be called early.
+         */
+        kirkwood_mpp_conf(goflexnet_mpp_config);
+
+        if (gpio_request(29, "USB Power Enable") != 0 ||
+            gpio_direction_output(29, 1) != 0)
+                pr_err("can't setup GPIO 29 (USB Power Enable)\n");
+        kirkwood_ehci_init();
+
+        kirkwood_ge00_init(&goflexnet_ge00_data);
+        kirkwood_sata_init(&goflexnet_sata_data);
+
+        platform_device_register(&goflexnet_leds);
+}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index e0c23245a73c..2fd03adbd711 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -82,6 +82,12 @@ void ib62x0_init(void);
 static inline void ib62x0_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_GOFLEXNET_DT
+void goflexnet_init(void);
+#else
+static inline void goflexnet_init(void) {};
+#endif
+
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);