Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

11 files changed, 453 insertions, 41 deletions

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index c3d513cad5ac..905719a677ae 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -57,6 +57,13 @@ config MACH_LINKSTATION_MINI
           Say 'Y' here if you want your kernel to support the
           Buffalo Linkstation Mini platform.
 
+config MACH_LINKSTATION_LS_HGL
+        bool "Buffalo Linkstation LS-HGL"
+        select I2C_BOARDINFO
+        help
+          Say 'Y' here if you want your kernel to support the
+          Buffalo Linkstation LS-HGL platform.
+
 config MACH_TS409
         bool "QNAP TS-409"
         help
diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
index 89772fcd65c7..eb6eabcb41e4 100644
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -5,6 +5,7 @@ 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_LINKSTATION_MINI) += lsmini-setup.o
+obj-$(CONFIG_MACH_LINKSTATION_LS_HGL) += ls_hgl-setup.o
 obj-$(CONFIG_MACH_DNS323)       += dns323-setup.o
 obj-$(CONFIG_MACH_TS209)        += ts209-setup.o tsx09-common.o
 obj-$(CONFIG_MACH_TS409)        += ts409-setup.o tsx09-common.o
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index f87fa1253803..8dc2c76d2260 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -488,7 +488,7 @@ static struct platform_device orion5x_xor0_channel = {
         .dev            = {
                 .dma_mask               = &orion5x_xor_dmamask,
                 .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = (void *)&orion5x_xor0_data,
+                .platform_data          = &orion5x_xor0_data,
         },
 };
 
@@ -514,7 +514,7 @@ static struct platform_device orion5x_xor1_channel = {
         .dev            = {
                 .dma_mask               = &orion5x_xor_dmamask,
                 .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = (void *)&orion5x_xor1_data,
+                .platform_data          = &orion5x_xor1_data,
         },
 };
 
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c
index 9d4bf763f25b..7130904ad999 100644
--- a/arch/arm/mach-orion5x/d2net-setup.c
+++ b/arch/arm/mach-orion5x/d2net-setup.c
@@ -149,10 +149,7 @@ static void __init d2net_sata_power_init(void)
 
 /*
  * The blue front LED is wired to the CPLD and can blink in relation with the
- * SATA activity. This feature is disabled to make this LED compatible with
- * the leds-gpio driver: MPP14 and MPP15 are configured to act like output
- * GPIO's and have to stay in an active state. This is needed to set the blue
- * LED in a "fix on" state regardless of the SATA activity.
+ * SATA activity.
  *
  * The following array detail the different LED registers and the combination
  * of their possible values:
@@ -171,12 +168,11 @@ static void __init d2net_sata_power_init(void)
 #define D2NET_GPIO_RED_LED              6
 #define D2NET_GPIO_BLUE_LED_BLINK_CTRL  16
 #define D2NET_GPIO_BLUE_LED_OFF         23
-#define D2NET_GPIO_SATA0_ACT            14
-#define D2NET_GPIO_SATA1_ACT            15
 
 static struct gpio_led d2net_leds[] = {
         {
-                .name = "d2net:blue:power",
+                .name = "d2net:blue:sata",
+                .default_trigger = "default-on",
                 .gpio = D2NET_GPIO_BLUE_LED_OFF,
                 .active_low = 1,
         },
@@ -201,25 +197,22 @@ static struct platform_device d2net_gpio_leds = {
 
 static void __init d2net_gpio_leds_init(void)
 {
+        int err;
+
         /* Configure GPIO over MPP max number. */
         orion_gpio_set_valid(D2NET_GPIO_BLUE_LED_OFF, 1);
 
-        if (gpio_request(D2NET_GPIO_SATA0_ACT, "LED SATA0 activity") != 0)
-                return;
-        if (gpio_direction_output(D2NET_GPIO_SATA0_ACT, 1) != 0)
-                goto err_free_1;
-        if (gpio_request(D2NET_GPIO_SATA1_ACT, "LED SATA1 activity") != 0)
-                goto err_free_1;
-        if (gpio_direction_output(D2NET_GPIO_SATA1_ACT, 1) != 0)
-                goto err_free_2;
-        platform_device_register(&d2net_gpio_leds);
-        return;
+        /* Configure register blink_ctrl to allow SATA activity LED blinking. */
+        err = gpio_request(D2NET_GPIO_BLUE_LED_BLINK_CTRL, "blue LED blink");
+        if (err == 0) {
+                err = gpio_direction_output(D2NET_GPIO_BLUE_LED_BLINK_CTRL, 1);
+                if (err)
+                        gpio_free(D2NET_GPIO_BLUE_LED_BLINK_CTRL);
+        }
+        if (err)
+                pr_err("d2net: failed to configure blue LED blink GPIO\n");
 
-err_free_2:
-        gpio_free(D2NET_GPIO_SATA1_ACT);
-err_free_1:
-        gpio_free(D2NET_GPIO_SATA0_ACT);
-        return;
+        platform_device_register(&d2net_gpio_leds);
 }
 
 /****************************************************************************
@@ -289,8 +282,8 @@ static struct orion5x_mpp_mode d2net_mpp_modes[] __initdata = {
         { 11, MPP_UNUSED },
         { 12, MPP_GPIO },       /* SATA 1 power */
         { 13, MPP_UNUSED },
-        { 14, MPP_GPIO },       /* SATA 0 active */
-        { 15, MPP_GPIO },       /* SATA 1 active */
+        { 14, MPP_SATA_LED },   /* SATA 0 active */
+        { 15, MPP_SATA_LED },   /* SATA 1 active */
         { 16, MPP_GPIO },       /* Blue front LED blink control */
         { 17, MPP_UNUSED },
         { 18, MPP_GPIO },       /* Front button (0 = Released, 1 = Pushed ) */
@@ -301,6 +294,8 @@ static struct orion5x_mpp_mode d2net_mpp_modes[] __initdata = {
         /* 24: Inhibit board power off (0 = Disabled, 1 = Enabled) */
 };
 
+#define D2NET_GPIO_INHIBIT_POWER_OFF    24
+
 static void __init d2net_init(void)
 {
         /*
@@ -333,6 +328,8 @@ static void __init d2net_init(void)
 
         i2c_register_board_info(0, d2net_i2c_devices,
                                 ARRAY_SIZE(d2net_i2c_devices));
+
+        orion_gpio_set_valid(D2NET_GPIO_INHIBIT_POWER_OFF, 1);
 }
 
 /* Warning: LaCie use a wrong mach-type (0x20e=526) in their bootloader. */
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index b31ca4cef365..421b82f7c63d 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -12,6 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
@@ -32,7 +33,9 @@
 
 #define DNS323_GPIO_LED_RIGHT_AMBER     1
 #define DNS323_GPIO_LED_LEFT_AMBER      2
-#define DNS323_GPIO_LED_POWER           5
+#define DNS323_GPIO_SYSTEM_UP           3
+#define DNS323_GPIO_LED_POWER1          4
+#define DNS323_GPIO_LED_POWER2          5
 #define DNS323_GPIO_OVERTEMP            6
 #define DNS323_GPIO_RTC                 7
 #define DNS323_GPIO_POWER_OFF           8
@@ -235,11 +238,31 @@ error_fail:
  * GPIO LEDs (simple - doesn't use hardware blinking support)
  */
 
+#define ORION_BLINK_HALF_PERIOD 100 /* ms */
+
+static int dns323_gpio_blink_set(unsigned gpio,
+        unsigned long *delay_on, unsigned long *delay_off)
+{
+        static int value = 0;
+
+        if (!*delay_on && !*delay_off)
+                *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
+
+        if (ORION_BLINK_HALF_PERIOD == *delay_on
+            && ORION_BLINK_HALF_PERIOD == *delay_off) {
+                value = !value;
+                orion_gpio_set_blink(gpio, value);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
 static struct gpio_led dns323_leds[] = {
         {
                 .name = "power:blue",
-                .gpio = DNS323_GPIO_LED_POWER,
-                .active_low = 1,
+                .gpio = DNS323_GPIO_LED_POWER2,
+                .default_trigger = "timer",
         }, {
                 .name = "right:amber",
                 .gpio = DNS323_GPIO_LED_RIGHT_AMBER,
@@ -254,6 +277,7 @@ static struct gpio_led dns323_leds[] = {
 static struct gpio_led_platform_data dns323_led_data = {
         .num_leds       = ARRAY_SIZE(dns323_leds),
         .leds           = dns323_leds,
+        .gpio_blink_set = dns323_gpio_blink_set,
 };
 
 static struct platform_device dns323_gpio_leds = {
@@ -334,7 +358,7 @@ static struct orion5x_mpp_mode dns323_mv88f5182_mpp_modes[] __initdata = {
         {  0, MPP_UNUSED },
         {  1, MPP_GPIO },               /* right amber LED (sata ch0) */
         {  2, MPP_GPIO },               /* left amber LED (sata ch1) */
-        {  3, MPP_UNUSED },
+        {  3, MPP_GPIO },               /* system up flag */
         {  4, MPP_GPIO },               /* power button LED */
         {  5, MPP_GPIO },               /* power button LED */
         {  6, MPP_GPIO },               /* GMT G751-2f overtemp */
@@ -372,13 +396,23 @@ static struct i2c_board_info __initdata dns323_i2c_devices[] = {
         },
 };
 
-/* DNS-323 specific power off method */
-static void dns323_power_off(void)
+/* DNS-323 rev. A specific power off method */
+static void dns323a_power_off(void)
 {
         pr_info("%s: triggering power-off...\n", __func__);
         gpio_set_value(DNS323_GPIO_POWER_OFF, 1);
 }
 
+/* DNS-323 rev B specific power off method */
+static void dns323b_power_off(void)
+{
+        pr_info("%s: triggering power-off...\n", __func__);
+        /* Pin has to be changed to 1 and back to 0 to do actual power off. */
+        gpio_set_value(DNS323_GPIO_POWER_OFF, 1);
+        mdelay(100);
+        gpio_set_value(DNS323_GPIO_POWER_OFF, 0);
+}
+
 static void __init dns323_init(void)
 {
         /* Setup basic Orion functions. Need to be called early. */
@@ -400,6 +434,14 @@ static void __init dns323_init(void)
         orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);
         platform_device_register(&dns323_nor_flash);
 
+        /* The 5181 power LED is active low and requires
+         * DNS323_GPIO_LED_POWER1 to also be low.
+         */
+        if (dns323_dev_id() == MV88F5181_DEV_ID) {
+                dns323_leds[0].active_low = 1;
+                gpio_direction_output(DNS323_GPIO_LED_POWER1, 0);
+        }
+
         platform_device_register(&dns323_gpio_leds);
 
         platform_device_register(&dns323_button_device);
@@ -424,11 +466,20 @@ static void __init dns323_init(void)
         if (dns323_dev_id() == MV88F5182_DEV_ID)
                 orion5x_sata_init(&dns323_sata_data);
 
-        /* register dns323 specific power-off method */
+        /* The 5182 has flag to indicate the system is up. Without this flag
+         * set, power LED will flash and cannot be controlled via leds-gpio.
+         */
+        if (dns323_dev_id() == MV88F5182_DEV_ID)
+                gpio_set_value(DNS323_GPIO_SYSTEM_UP, 1);
+
+        /* Register dns323 specific power-off method */
         if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
             gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
                 pr_err("DNS323: failed to setup power-off GPIO\n");
-        pm_power_off = dns323_power_off;
+        if (dns323_dev_id() == MV88F5182_DEV_ID)
+                pm_power_off = dns323b_power_off;
+        else
+                pm_power_off = dns323a_power_off;
 }
 
 /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S
index c7f808bfe272..91e0e39bb23f 100644
--- a/arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S
@@ -10,7 +10,7 @@
 
 #include <mach/orion5x.h>
 
-        .macro  addruart,rx
+        .macro  addruart, rx, tmp
         mrc     p15, 0, \rx, c1, c0
         tst     \rx, #1                                 @ MMU enabled?
         ldreq   \rx, =ORION5X_REGS_PHYS_BASE
diff --git a/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h
index 7147a297e97f..06b50aeff7b9 100644
--- a/arch/arm/mach-orion5x/include/mach/vmalloc.h
+++ b/arch/arm/mach-orion5x/include/mach/vmalloc.h
@@ -2,4 +2,4 @@
  * arch/arm/mach-orion5x/include/mach/vmalloc.h
  */
 
-#define VMALLOC_END       0xfd800000
+#define VMALLOC_END       0xfd800000UL
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
new file mode 100644
index 000000000000..8e569be6e2c7
--- /dev/null
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -0,0 +1,276 @@
+/*
+ * arch/arm/mach-orion5x/ls_hgl-setup.c
+ *
+ * Maintainer: Zhu Qingsen <zhuqs@cn.fujitsu.com>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/leds.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/i2c.h>
+#include <linux/ata_platform.h>
+#include <linux/gpio.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/system.h>
+#include <mach/orion5x.h>
+#include "common.h"
+#include "mpp.h"
+
+/*****************************************************************************
+ * Linkstation LS-HGL Info
+ ****************************************************************************/
+
+/*
+ * 256K NOR flash Device bus boot chip select
+ */
+
+#define LS_HGL_NOR_BOOT_BASE    0xf4000000
+#define LS_HGL_NOR_BOOT_SIZE    SZ_256K
+
+/*****************************************************************************
+ * 256KB NOR Flash on BOOT Device
+ ****************************************************************************/
+
+static struct physmap_flash_data ls_hgl_nor_flash_data = {
+        .width          = 1,
+};
+
+static struct resource ls_hgl_nor_flash_resource = {
+        .flags  = IORESOURCE_MEM,
+        .start  = LS_HGL_NOR_BOOT_BASE,
+        .end    = LS_HGL_NOR_BOOT_BASE + LS_HGL_NOR_BOOT_SIZE - 1,
+};
+
+static struct platform_device ls_hgl_nor_flash = {
+        .name                   = "physmap-flash",
+        .id                     = 0,
+        .dev            = {
+                .platform_data  = &ls_hgl_nor_flash_data,
+        },
+        .num_resources          = 1,
+        .resource               = &ls_hgl_nor_flash_resource,
+};
+
+/*****************************************************************************
+ * Ethernet
+ ****************************************************************************/
+
+static struct mv643xx_eth_platform_data ls_hgl_eth_data = {
+        .phy_addr       = 8,
+};
+
+/*****************************************************************************
+ * RTC 5C372a on I2C bus
+ ****************************************************************************/
+
+static struct i2c_board_info __initdata ls_hgl_i2c_rtc = {
+        I2C_BOARD_INFO("rs5c372a", 0x32),
+};
+
+/*****************************************************************************
+ * LEDs attached to GPIO
+ ****************************************************************************/
+
+#define LS_HGL_GPIO_LED_ALARM   2
+#define LS_HGL_GPIO_LED_INFO    3
+#define LS_HGL_GPIO_LED_FUNC    17
+#define LS_HGL_GPIO_LED_PWR     0
+
+
+static struct gpio_led ls_hgl_led_pins[] = {
+        {
+                .name      = "alarm:red",
+                .gpio      = LS_HGL_GPIO_LED_ALARM,
+                .active_low     = 1,
+        }, {
+                .name      = "info:amber",
+                .gpio      = LS_HGL_GPIO_LED_INFO,
+                .active_low     = 1,
+        }, {
+                .name      = "func:blue:top",
+                .gpio      = LS_HGL_GPIO_LED_FUNC,
+                .active_low     = 1,
+        }, {
+                .name      = "power:blue:bottom",
+                .gpio      = LS_HGL_GPIO_LED_PWR,
+        },
+};
+
+static struct gpio_led_platform_data ls_hgl_led_data = {
+        .leds      = ls_hgl_led_pins,
+        .num_leds       = ARRAY_SIZE(ls_hgl_led_pins),
+};
+
+static struct platform_device ls_hgl_leds = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &ls_hgl_led_data,
+        },
+};
+
+/****************************************************************************
+ * GPIO Attached Keys
+ ****************************************************************************/
+#define LS_HGL_GPIO_KEY_FUNC       15
+#define LS_HGL_GPIO_KEY_POWER      8
+#define LS_HGL_GPIO_KEY_AUTOPOWER  10
+
+#define LS_HGL_SW_POWER     0x00
+#define LS_HGL_SW_AUTOPOWER 0x01
+
+static struct gpio_keys_button ls_hgl_buttons[] = {
+        {
+                .code      = KEY_OPTION,
+                .gpio      = LS_HGL_GPIO_KEY_FUNC,
+                .desc      = "Function Button",
+                .active_low     = 1,
+        }, {
+                .type           = EV_SW,
+                .code      = LS_HGL_SW_POWER,
+                .gpio      = LS_HGL_GPIO_KEY_POWER,
+                .desc      = "Power-on Switch",
+                .active_low     = 1,
+        }, {
+                .type           = EV_SW,
+                .code      = LS_HGL_SW_AUTOPOWER,
+                .gpio      = LS_HGL_GPIO_KEY_AUTOPOWER,
+                .desc      = "Power-auto Switch",
+                .active_low     = 1,
+        },
+};
+
+static struct gpio_keys_platform_data ls_hgl_button_data = {
+        .buttons        = ls_hgl_buttons,
+        .nbuttons       = ARRAY_SIZE(ls_hgl_buttons),
+};
+
+static struct platform_device ls_hgl_button_device = {
+        .name      = "gpio-keys",
+        .id          = -1,
+        .num_resources  = 0,
+        .dev        = {
+                .platform_data  = &ls_hgl_button_data,
+        },
+};
+
+
+/*****************************************************************************
+ * SATA
+ ****************************************************************************/
+static struct mv_sata_platform_data ls_hgl_sata_data = {
+        .n_ports        = 2,
+};
+
+
+/*****************************************************************************
+ * Linkstation LS-HGL specific power off method: reboot
+ ****************************************************************************/
+/*
+ * On the Linkstation LS-HGL, the shutdown process is following:
+ * - Userland monitors key events until the power switch goes to off position
+ * - The board reboots
+ * - U-boot starts and goes into an idle mode waiting for the user
+ *   to move the switch to ON position
+ */
+
+static void ls_hgl_power_off(void)
+{
+        arm_machine_restart('h', NULL);
+}
+
+
+/*****************************************************************************
+ * General Setup
+ ****************************************************************************/
+
+#define LS_HGL_GPIO_USB_POWER   9
+#define LS_HGL_GPIO_AUTO_POWER  10
+#define LS_HGL_GPIO_POWER           8
+
+#define LS_HGL_GPIO_HDD_POWER   1
+
+static struct orion5x_mpp_mode ls_hgl_mpp_modes[] __initdata = {
+        {  0, MPP_GPIO }, /* LED_PWR */
+        {  1, MPP_GPIO }, /* HDD_PWR */
+        {  2, MPP_GPIO }, /* LED_ALARM */
+        {  3, MPP_GPIO }, /* LED_INFO */
+        {  4, MPP_UNUSED },
+        {  5, MPP_UNUSED },
+        {  6, MPP_GPIO }, /* FAN_LCK */
+        {  7, MPP_GPIO }, /* INIT */
+        {  8, MPP_GPIO }, /* POWER */
+        {  9, MPP_GPIO }, /* USB_PWR */
+        { 10, MPP_GPIO }, /* AUTO_POWER */
+        { 11, MPP_UNUSED }, /* LED_ETH (dummy) */
+        { 12, MPP_UNUSED },
+        { 13, MPP_UNUSED },
+        { 14, MPP_UNUSED },
+        { 15, MPP_GPIO }, /* FUNC */
+        { 16, MPP_UNUSED },
+        { 17, MPP_GPIO }, /* LED_FUNC */
+        { 18, MPP_UNUSED },
+        { 19, MPP_UNUSED },
+        { -1 },
+};
+
+static void __init ls_hgl_init(void)
+{
+        /*
+         * Setup basic Orion functions. Need to be called early.
+         */
+        orion5x_init();
+
+        orion5x_mpp_conf(ls_hgl_mpp_modes);
+
+        /*
+         * Configure peripherals.
+         */
+        orion5x_ehci0_init();
+        orion5x_ehci1_init();
+        orion5x_eth_init(&ls_hgl_eth_data);
+        orion5x_i2c_init();
+        orion5x_sata_init(&ls_hgl_sata_data);
+        orion5x_uart0_init();
+        orion5x_xor_init();
+
+        orion5x_setup_dev_boot_win(LS_HGL_NOR_BOOT_BASE,
+                                   LS_HGL_NOR_BOOT_SIZE);
+        platform_device_register(&ls_hgl_nor_flash);
+
+        platform_device_register(&ls_hgl_button_device);
+
+        platform_device_register(&ls_hgl_leds);
+
+        i2c_register_board_info(0, &ls_hgl_i2c_rtc, 1);
+
+        /* enable USB power */
+        gpio_set_value(LS_HGL_GPIO_USB_POWER, 1);
+
+        /* register power-off method */
+        pm_power_off = ls_hgl_power_off;
+
+        pr_info("%s: finished\n", __func__);
+}
+
+MACHINE_START(LINKSTATION_LS_HGL, "Buffalo Linkstation LS-HGL")
+        /* Maintainer: Zhu Qingsen <zhuqs@cn.fujistu.com> */
+        .phys_io        = ORION5X_REGS_PHYS_BASE,
+        .io_pg_offst    = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC,
+        .boot_params    = 0x00000100,
+        .init_machine   = ls_hgl_init,
+        .map_io         = orion5x_map_io,
+        .init_irq       = orion5x_init_irq,
+        .timer          = &orion5x_timer,
+        .fixup          = tag_fixup_mem32,
+MACHINE_END
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index c9bf6b81a80d..c704f056de1e 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -11,7 +11,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pci.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/leds.h>
@@ -19,12 +18,13 @@
 #include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/ata_platform.h>
-#include <asm/mach-types.h>
 #include <linux/gpio.h>
+#include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/system.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
-#include "include/mach/system.h"
 
 /*****************************************************************************
  * Linkstation Mini Info
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data lsmini_sata_data = {
 
 static void lsmini_power_off(void)
 {
-        arch_reset(0, NULL);
+        arm_machine_restart('h', NULL);
 }
 
 
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 36dc5413cc97..e8706f15a670 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -12,6 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/mbus.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
@@ -463,7 +464,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram)
         writel(win_enable, PCI_BAR_ENABLE);
 
         /*
-         * Disable automatic update of address remaping when writing to BARs.
+         * Disable automatic update of address remapping when writing to BARs.
          */
         orion5x_setbits(PCI_ADDR_DECODE_CTRL, 1);
 }
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 1b4ad9d5e2eb..f9f222ebb7ed 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -15,6 +15,9 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ethtool.h>
+#include <linux/leds.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
 #include <net/dsa.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
@@ -24,6 +27,80 @@
 #include "common.h"
 #include "mpp.h"
 
+/*
+ * LEDs attached to GPIO
+ */
+static struct gpio_led wrt350n_v2_led_pins[] = {
+        {
+                .name           = "wrt350nv2:green:power",
+                .gpio           = 0,
+                .active_low     = 1,
+        }, {
+                .name           = "wrt350nv2:green:security",
+                .gpio           = 1,
+                .active_low     = 1,
+        }, {
+                .name           = "wrt350nv2:orange:power",
+                .gpio           = 5,
+                .active_low     = 1,
+        }, {
+                .name           = "wrt350nv2:green:usb",
+                .gpio           = 6,
+                .active_low     = 1,
+        }, {
+                .name           = "wrt350nv2:green:wireless",
+                .gpio           = 7,
+                .active_low     = 1,
+        },
+};
+
+static struct gpio_led_platform_data wrt350n_v2_led_data = {
+        .leds           = wrt350n_v2_led_pins,
+        .num_leds       = ARRAY_SIZE(wrt350n_v2_led_pins),
+};
+
+static struct platform_device wrt350n_v2_leds = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &wrt350n_v2_led_data,
+        },
+};
+
+/*
+ * Buttons attached to GPIO
+ */
+static struct gpio_keys_button wrt350n_v2_buttons[] = {
+        {
+                .code           = KEY_RESTART,
+                .gpio           = 3,
+                .desc           = "Reset Button",
+                .active_low     = 1,
+        }, {
+                .code           = KEY_WPS_BUTTON,
+                .gpio           = 2,
+                .desc           = "WPS Button",
+                .active_low     = 1,
+        },
+};
+
+static struct gpio_keys_platform_data wrt350n_v2_button_data = {
+        .buttons        = wrt350n_v2_buttons,
+        .nbuttons       = ARRAY_SIZE(wrt350n_v2_buttons),
+};
+
+static struct platform_device wrt350n_v2_button_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &wrt350n_v2_button_data,
+        },
+};
+
+/*
+ * General setup
+ */
 static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = {
         {  0, MPP_GPIO },               /* Power LED green (0=on) */
         {  1, MPP_GPIO },               /* Security LED (0=on) */
@@ -140,6 +217,8 @@ static void __init wrt350n_v2_init(void)
         orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,
                                    WRT350N_V2_NOR_BOOT_SIZE);
         platform_device_register(&wrt350n_v2_nor_flash);
+        platform_device_register(&wrt350n_v2_leds);
+        platform_device_register(&wrt350n_v2_button_device);
 }
 
 static int __init wrt350n_v2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)