improve MZK-W300NH support (thanks to Kazuki Shimada for the board)

SVN-Revision: 16340

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index c7a6063422585c6af11b95b94daba29195721f59..7643a1a7d7a29e3b2865f7fd91f5f9db36d207a6 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -22,6 +22,9 @@ ar71xx_board_name() {
        *MZK-W04NU)
                name="mzk-w04nu"
                ;;
+       *MZK-W300NH)
+               name="mzk-w300nh"
+               ;;
        *PB42)
                name="pb42"
                ;;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
index 2e9d3bc6e7dff1241fbfc153ae13c40ad3992464..9ab8b1b13959dff659212864695b8bba35d72752 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <linux/input.h>
 
 #include <asm/mips_machine.h>
 
@@ -21,6 +22,18 @@
 
 #include "devices.h"
 
+#define MZK_W300NH_GPIO_LED_STATUS     1
+#define MZK_W300NH_GPIO_LED_WPS                3
+#define MZK_W300NH_GPIO_LED_WLAN       6
+#define MZK_W300NH_GPIO_LED_AP         15
+#define MZK_W300NH_GPIO_LED_ROUTER     16
+
+#define MZK_W300NH_GPIO_BTN_APROUTER   5
+#define MZK_W300NH_GPIO_BTN_WPS                12
+#define MZK_W300NH_GPIO_BTN_RESET      21
+
+#define MZK_W04NU_BUTTONS_POLL_INTERVAL        20
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition mzk_w300nh_partitions[] = {
        {
@@ -33,7 +46,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
                .offset         = 0x040000,
                .size           = 0x010000,
        } , {
-               .name           = "uImage",
+               .name           = "kernel",
                .offset         = 0x050000,
                .size           = 0x160000,
        } , {
@@ -70,11 +83,84 @@ static struct spi_board_info mzk_w300nh_spi_info[] = {
        }
 };
 
+static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
+       {
+               .name           = "mzk-w300nh:green:status",
+               .gpio           = MZK_W300NH_GPIO_LED_STATUS,
+               .active_low     = 1,
+       }, {
+               .name           = "mzk-w300nh:blue:wps",
+               .gpio           = MZK_W300NH_GPIO_LED_WPS,
+               .active_low     = 1,
+       }, {
+               .name           = "mzk-w300nh:green:wlan",
+               .gpio           = MZK_W300NH_GPIO_LED_WLAN,
+               .active_low     = 1,
+       }, {
+               .name           = "mzk-w300nh:green:ap",
+               .gpio           = MZK_W300NH_GPIO_LED_AP,
+               .active_low     = 1,
+       }, {
+               .name           = "mzk-w300nh:green:router",
+               .gpio           = MZK_W300NH_GPIO_LED_ROUTER,
+               .active_low     = 1,
+       }
+};
+
+static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = {
+       {
+               .desc           = "reset",
+               .type           = EV_KEY,
+               .code           = BTN_0,
+               .threshold      = 5,
+               .gpio           = MZK_W300NH_GPIO_BTN_RESET,
+               .active_low     = 1,
+       }, {
+               .desc           = "wps",
+               .type           = EV_KEY,
+               .code           = BTN_1,
+               .threshold      = 5,
+               .gpio           = MZK_W300NH_GPIO_BTN_WPS,
+               .active_low     = 1,
+       }, {
+               .desc           = "aprouter",
+               .type           = EV_KEY,
+               .code           = BTN_2,
+               .threshold      = 5,
+               .gpio           = MZK_W300NH_GPIO_BTN_APROUTER,
+               .active_low     = 0,
+       }
+};
+
 static void __init mzk_w300nh_setup(void)
 {
+       u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
+
+       ar71xx_set_mac_base(mac);
+
+       ar71xx_add_device_mdio(0x0);
+
+       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth0_data.phy_mask = 0xf;
+       ar71xx_eth0_data.speed = SPEED_100;
+       ar71xx_eth0_data.duplex = DUPLEX_FULL;
+       ar71xx_eth0_data.has_ar8216 = 1;
+
+       ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth1_data.phy_mask = 0x10;
+
+       ar71xx_add_device_eth(0);
+       ar71xx_add_device_eth(1);
+
        ar71xx_add_device_spi(NULL, mzk_w300nh_spi_info,
-                                       ARRAY_SIZE(mzk_w300nh_spi_info));
+                             ARRAY_SIZE(mzk_w300nh_spi_info));
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w300nh_leds_gpio),
+                                   mzk_w300nh_leds_gpio);
 
+       ar71xx_add_device_gpio_buttons(-1, MZK_W04NU_BUTTONS_POLL_INTERVAL,
+                                      ARRAY_SIZE(mzk_w300nh_gpio_buttons),
+                                      mzk_w300nh_gpio_buttons);
        ar91xx_add_device_wmac();
 }