ar71xx: mikrotik: mach-rbspi.c remove wlan id
[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-rbspi.c
index b26b1ae46eb7c3fcf94863249608b9f379c4189c..cb05c9142c6e62dd33151b62e136c894e911645f 100644 (file)
@@ -1,28 +1,39 @@
 /*
  *  MikroTik SPI-NOR RouterBOARDs support
  *
+ *  - MikroTik RouterBOARD mAP 2nD
  *  - MikroTik RouterBOARD mAP L-2nD
+ *  - MikroTik RouterBOARD 911-2Hn (911 Lite2)
+ *  - MikroTik RouterBOARD 911-5Hn (911 Lite5)
+ *  - MikroTik RouterBOARD 931-2nD (hAP mini)
  *  - MikroTik RouterBOARD 941L-2nD
  *  - MikroTik RouterBOARD 951Ui-2nD
+ *  - MikroTik RouterBOARD 952Ui-5ac2nD
+ *  - MikroTik RouterBOARD 962UiGS-5HacT2HnT
  *  - MikroTik RouterBOARD 750UP r2
+ *  - MikroTik RouterBOARD 750P-PBr2
  *  - MikroTik RouterBOARD 750 r2
  *  - MikroTik RouterBOARD LHG 5nD
+ *  - MikroTik RouterBOARD wAP2nD
+ *  - MikroTik RouterBOARD wAP G-5HacT2HnDwAP (wAP AC)
+ *  - MikroTik RouterBOARD wAP R-2nD
  *
  *  Preliminary support for the following hardware
- *  - MikroTik RouterBOARD wAP2nD
  *  - MikroTik RouterBOARD cAP2nD
- *  - MikroTik RouterBOARD mAP2nD
  *  Furthermore, the cAP lite (cAPL2nD) appears to feature the exact same
  *  hardware as the mAP L-2nD. It is unknown if they share the same board
  *  identifier.
  *
- *  Copyright (C) 2017 Thibaut VARENE <varenet@parisc-linux.org>
+ *  Copyright (C) 2017-2018 Thibaut VARENE <varenet@parisc-linux.org>
+ *  Copyright (C) 2016 David Hutchison <dhutchison@bluemesh.net>
+ *  Copyright (C) 2017 Ryan Mounce <ryan@mounce.com.au>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
  *  by the Free Software Foundation.
  */
 
+#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
 #include <linux/routerboot.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
+#include <linux/ar8216_platform.h>
+#include <linux/platform_data/phy-at803x.h>
+#include <linux/platform_data/mdio-gpio.h>
+
 #include <asm/prom.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
 #include <asm/mach-ath79/ath79.h>
@@ -47,6 +62,7 @@
 #include "dev-usb.h"
 #include "dev-wmac.h"
 #include "machtypes.h"
+#include "pci.h"
 #include "routerboot.h"
 
 #define RBSPI_KEYS_POLL_INTERVAL 20 /* msecs */
@@ -59,6 +75,7 @@
 #define RBSPI_HAS_SSR          BIT(4)  /* has an SSR on SPI bus 0 */
 #define RBSPI_HAS_POE          BIT(5)
 #define RBSPI_HAS_MDIO1                BIT(6)
+#define RBSPI_HAS_PCI          BIT(7)
 
 #define RB_ROUTERBOOT_OFFSET    0x0000
 #define RB_BIOS_SIZE            0x1000
@@ -124,16 +141,17 @@ static struct flash_platform_data rbspi_spi_flash_data = {
        .nr_parts = ARRAY_SIZE(rbspi_spi_partitions),
 };
 
-/* Several boards only have a single reset button wired to GPIO 16 */
-#define RBSPI_GPIO_BTN_RESET16 16
-
-static struct gpio_keys_button rbspi_gpio_keys_reset16[] __initdata = {
+/*
+ * Several boards only have a single reset button, use a common
+ * structure for that.
+ */
+static struct gpio_keys_button rbspi_gpio_keys_reset[] __initdata = {
        {
                .desc = "Reset button",
                .type = EV_KEY,
                .code = KEY_RESTART,
                .debounce_interval = RBSPI_KEYS_DEBOUNCE_INTERVAL,
-               .gpio = RBSPI_GPIO_BTN_RESET16,
+               .gpio = -ENOENT, /* filled dynamically */
                .active_low = 1,
        },
 };
@@ -143,6 +161,7 @@ static struct gpio_keys_button rbspi_gpio_keys_reset16[] __initdata = {
 #define RBMAPL_GPIO_LED_USER   14
 #define RBMAPL_GPIO_LED_ETH    4
 #define RBMAPL_GPIO_LED_WLAN   11
+#define RBMAPL_GPIO_BTN_RESET  16
 
 static struct gpio_led rbmapl_leds[] __initdata = {
        {
@@ -167,6 +186,8 @@ static struct gpio_led rbmapl_leds[] __initdata = {
 
 /* RB 941L-2nD gpios */
 #define RBHAPL_GPIO_LED_USER   14
+#define RBHAPL_GPIO_BTN_RESET  16
+
 static struct gpio_led rbhapl_leds[] __initdata = {
        {
                .name = "rb:green:user",
@@ -191,7 +212,8 @@ static struct gpio_led rbhapl_leds[] __initdata = {
 #define RB952_GPIO_LED_USER    4
 #define RB952_GPIO_POE_POWER   14
 #define RB952_GPIO_POE_STATUS  12
-#define RB952_GPIO_USB_POWER   RBSPI_SSR_GPIO(RB952_SSR_BIT_USB_POWER)
+#define RB952_GPIO_BTN_RESET   16
+#define RB952_GPIO_USB_PWROFF  RBSPI_SSR_GPIO(RB952_SSR_BIT_USB_POWER)
 #define RB952_GPIO_LED_LAN1    RBSPI_SSR_GPIO(RB952_SSR_BIT_LED_LAN1)
 #define RB952_GPIO_LED_LAN2    RBSPI_SSR_GPIO(RB952_SSR_BIT_LED_LAN2)
 #define RB952_GPIO_LED_LAN3    RBSPI_SSR_GPIO(RB952_SSR_BIT_LED_LAN3)
@@ -231,9 +253,90 @@ static struct gpio_led rb952_leds[] __initdata = {
        },
 };
 
+
+/* RB 962UiGS-5HacT2HnT gpios */
+#define RB962_WIFI_LED_1       1
+#define RB962_WIFI_LED_2       2
+#define RB962_GPIO_POE_STATUS  2
+#define RB962_GPIO_POE_POWER   3
+#define RB962_GPIO_LED_USER    12
+#define RB962_GPIO_USB_PWROFF  13
+#define RB962_GPIO_BTN_RESET   20
+
+static struct gpio_led rb962_leds_gpio[] __initdata = {
+       {
+               .name           = "rb:green:user",
+               .gpio           = RB962_GPIO_LED_USER,
+               .active_low     = 1,
+       },
+};
+
+static const struct ar8327_led_info rb962_leds_ar8327[] = {
+               AR8327_LED_INFO(PHY0_0, HW, "rb:green:port1"),
+               AR8327_LED_INFO(PHY1_0, HW, "rb:green:port2"),
+               AR8327_LED_INFO(PHY2_0, HW, "rb:green:port3"),
+               AR8327_LED_INFO(PHY3_0, HW, "rb:green:port4"),
+               AR8327_LED_INFO(PHY4_0, HW, "rb:green:port5"),
+};
+
+static struct ar8327_pad_cfg rb962_ar8327_pad0_cfg = {
+               .mode = AR8327_PAD_MAC_RGMII,
+               .txclk_delay_en = true,
+               .rxclk_delay_en = true,
+               .txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+               .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+               .mac06_exchange_dis = true,
+};
+
+static struct ar8327_pad_cfg rb962_ar8327_pad6_cfg = {
+               /* Use SGMII interface for GMAC6 of the AR8337 switch */
+               .mode = AR8327_PAD_MAC_SGMII,
+               .rxclk_delay_en = true,
+               .rxclk_delay_sel = AR8327_CLK_DELAY_SEL0,
+};
+
+static struct ar8327_led_cfg rb962_ar8327_led_cfg = {
+               .led_ctrl0 = 0xc737c737,
+               .led_ctrl1 = 0x00000000,
+               .led_ctrl2 = 0x00000000,
+               .led_ctrl3 = 0x0030c300,
+               .open_drain = false,
+};
+
+static struct ar8327_platform_data rb962_ar8327_data = {
+               .pad0_cfg = &rb962_ar8327_pad0_cfg,
+               .pad6_cfg = &rb962_ar8327_pad6_cfg,
+               .port0_cfg = {
+                               .force_link = 1,
+                               .speed = AR8327_PORT_SPEED_1000,
+                               .duplex = 1,
+                               .txpause = 1,
+                               .rxpause = 1,
+               },
+               .port6_cfg = {
+                               .force_link = 1,
+                               .speed = AR8327_PORT_SPEED_1000,
+                               .duplex = 1,
+                               .txpause = 1,
+                               .rxpause = 1,
+               },
+               .led_cfg = &rb962_ar8327_led_cfg,
+               .num_leds = ARRAY_SIZE(rb962_leds_ar8327),
+               .leds = rb962_leds_ar8327,
+};
+
+static struct mdio_board_info rb962_mdio0_info[] = {
+               {
+                               .bus_id = "ag71xx-mdio.0",
+                               .mdio_addr = 0,
+                               .platform_data = &rb962_ar8327_data,
+               },
+};
+
 /* RB wAP-2nD gpios */
 #define RBWAP_GPIO_LED_USER    14
 #define RBWAP_GPIO_LED_WLAN    11
+#define RBWAP_GPIO_BTN_RESET   16
 
 static struct gpio_led rbwap_leds[] __initdata = {
        {
@@ -282,11 +385,12 @@ static struct gpio_led rbcap_leds[] __initdata = {
 #define RBMAP_SSR_BIT_LED_WLAN 4
 #define RBMAP_SSR_BIT_USB_POWER        5
 #define RBMAP_SSR_BIT_LED_APCAP        6
+#define RBMAP_GPIO_BTN_RESET   16
 #define RBMAP_GPIO_SSR_CS      11
 #define RBMAP_GPIO_LED_POWER   4
 #define RBMAP_GPIO_POE_POWER   14
 #define RBMAP_GPIO_POE_STATUS  12
-#define RBMAP_GPIO_USB_POWER   RBSPI_SSR_GPIO(RBMAP_SSR_BIT_USB_POWER)
+#define RBMAP_GPIO_USB_PWROFF  RBSPI_SSR_GPIO(RBMAP_SSR_BIT_USB_POWER)
 #define RBMAP_GPIO_LED_LAN1    RBSPI_SSR_GPIO(RBMAP_SSR_BIT_LED_LAN1)
 #define RBMAP_GPIO_LED_LAN2    RBSPI_SSR_GPIO(RBMAP_SSR_BIT_LED_LAN2)
 #define RBMAP_GPIO_LED_POEO    RBSPI_SSR_GPIO(RBMAP_SSR_BIT_LED_POEO)
@@ -306,7 +410,7 @@ static struct gpio_led rbmap_leds[] __initdata = {
                .active_low = 1,
        }, {
                .name = "rb:green:eth2",
-               .gpio = RBMAP_GPIO_LED_WLAN,
+               .gpio = RBMAP_GPIO_LED_LAN2,
                .active_low = 1,
        }, {
                .name = "rb:red:poe_out",
@@ -375,20 +479,166 @@ static struct gpio_led rblhg_leds[] __initdata = {
        },
 };
 
-static struct gpio_keys_button rblhg_gpio_keys[] __initdata = {
+/* RB w APG-5HacT2HnD (wAP AC) gpios*/
+#define RBWAPGSC_WIFI_LED_1            1
+#define RBWAPGSC_WIFI_LED_2            8
+#define RBWAPGSC_WIFI_LED_3            9
+#define RBWAPGSC_GPIO_LED_POWER                16
+#define RBWAPGSC_GPIO_BTN_RESET                1
+#define RBWAPGSC_GPIO_MDIO_MDC         12
+#define RBWAPGSC_GPIO_MDIO_DATA                11
+#define RBWAPGSC_MDIO_PHYADDR          0
+
+static struct gpio_led rbwapgsc_leds[] __initdata = {
+       {
+               .name = "rb:green:power",
+               .gpio = RBWAPGSC_GPIO_LED_POWER,
+               .active_low = 1,
+               .default_state = LEDS_GPIO_DEFSTATE_ON,
+       },
+};
+
+static struct mdio_gpio_platform_data rbwapgsc_mdio_data = {
+       .mdc = RBWAPGSC_GPIO_MDIO_MDC,
+       .mdio = RBWAPGSC_GPIO_MDIO_DATA,
+       .phy_mask = ~BIT(RBWAPGSC_MDIO_PHYADDR),
+};
+
+static struct platform_device rbwapgsc_phy_device = {
+       .name = "mdio-gpio",
+       .id = 1,
+       .dev = {
+               .platform_data = &rbwapgsc_mdio_data
+       },
+};
+
+static struct at803x_platform_data rbwapgsc_at803x_data = {
+       .override_sgmii_aneg = 1,
+};
+
+static struct mdio_board_info rbwapgsc_mdio_info[] = {
+       {
+               .bus_id = "gpio-1",
+               .mdio_addr = RBWAPGSC_MDIO_PHYADDR,
+               .platform_data = &rbwapgsc_at803x_data,
+       },
+};
+
+/* RB911L GPIOs */
+#define RB911L_GPIO_BTN_RESET  15
+#define RB911L_GPIO_LED_1      13
+#define RB911L_GPIO_LED_2      12
+#define RB911L_GPIO_LED_3      4
+#define RB911L_GPIO_LED_4      21
+#define RB911L_GPIO_LED_5      18
+#define RB911L_GPIO_LED_ETH    20
+#define RB911L_GPIO_LED_POWER  11
+#define RB911L_GPIO_LED_USER   3
+#define RB911L_GPIO_PIN_HOLE   14 /* for reference, active low */
+
+static struct gpio_led rb911l_leds[] __initdata = {
+       {
+               .name = "rb:green:eth",
+               .gpio = RB911L_GPIO_LED_ETH,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:led1",
+               .gpio = RB911L_GPIO_LED_1,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:led2",
+               .gpio = RB911L_GPIO_LED_2,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:led3",
+               .gpio = RB911L_GPIO_LED_3,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:led4",
+               .gpio = RB911L_GPIO_LED_4,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:led5",
+               .gpio = RB911L_GPIO_LED_5,
+               .active_low = 1,
+       }, {
+               .name = "rb:green:power",
+               .gpio = RB911L_GPIO_LED_POWER,
+               .default_state = LEDS_GPIO_DEFSTATE_ON,
+               .active_low = 1,
+               .open_drain = 1,
+       }, {
+               .name = "rb:green:user",
+               .gpio = RB911L_GPIO_LED_USER,
+               .active_low = 1,
+               .open_drain = 1,
+       },
+};
+
+/* RB 931-2nD gpios */
+#define RB931_GPIO_BTN_RESET   0
+#define RB931_GPIO_BTN_MODE    9
+#define RB931_GPIO_LED_USER    1
+
+static struct gpio_keys_button rb931_gpio_keys[] __initdata = {
        {
                .desc = "Reset button",
                .type = EV_KEY,
                .code = KEY_RESTART,
                .debounce_interval = RBSPI_KEYS_DEBOUNCE_INTERVAL,
-               .gpio = RBLHG_GPIO_BTN_RESET,
+               .gpio = RB931_GPIO_BTN_RESET,
+               .active_low = 1,
+       }, {
+               .desc = "Mode button",
+               .type = EV_KEY,
+               .code = BTN_0,
+               .debounce_interval = RBSPI_KEYS_DEBOUNCE_INTERVAL,
+               .gpio = RB931_GPIO_BTN_MODE,
+               .active_low = 1,
+       }
+};
+
+static struct gpio_led rb931_leds[] __initdata = {
+       {
+               .name = "rb:green:user",
+               .gpio = RB931_GPIO_LED_USER,
                .active_low = 1,
        },
 };
 
+/* RB wAP R-2nD (wAP R) gpios*/
+#define RBWAPR_GPIO_LED_USER   14
+#define RBWAPR_GPIO_LED1       12
+#define RBWAPR_GPIO_LED2       13
+#define RBWAPR_GPIO_LED3       3
+#define RBWAPR_GPIO_PCIE_PWROFF        15
+#define RBWAPR_GPIO_CONTROL    10
+#define RBWAPR_GPIO_BTN_RESET  16
+
+static struct gpio_led rbwapr_leds[] __initdata = {
+       {
+               .name = "rb:green:user",
+               .gpio = RBWAPR_GPIO_LED_USER,
+               .active_low = 0,
+       },{
+               .name = "rb:green:led1",
+               .gpio = RBWAPR_GPIO_LED1,
+               .active_low = 1,
+       },{
+               .name = "rb:green:led2",
+               .gpio = RBWAPR_GPIO_LED2,
+               .active_low = 1,
+       },{
+               .name = "rb:green:led3",
+               .gpio = RBWAPR_GPIO_LED3,
+               .active_low = 0,
+       },
+};
+
 
 static struct gen_74x164_chip_platform_data rbspi_ssr_data = {
        .base = RBSPI_SSR_GPIO_BASE,
+       .num_registers = 1,
 };
 
 /* the spi-ath79 driver can only natively handle CS0. Other CS are bit-banged */
@@ -422,12 +672,12 @@ static struct spi_board_info rbspi_spi_info[] = {
        }
 };
 
-void __init rbspi_wlan_init(u16 id, int wmac_offset)
+void __init rbspi_wlan_init(int wmac_offset)
 {
        char *art_buf;
        u8 wlan_mac[ETH_ALEN];
 
-       art_buf = rb_get_ext_wlan_data(id);
+       art_buf = rb_get_wlan_data();
        if (!art_buf)
                return;
 
@@ -437,26 +687,38 @@ void __init rbspi_wlan_init(u16 id, int wmac_offset)
        kfree(art_buf);
 }
 
-/* 
+#define RBSPI_MACH_BUFLEN      64
+/*
  * Common platform init routine for all SPI NOR devices.
  */
-static int __init rbspi_platform_setup(void)
+static __init const struct rb_info *rbspi_platform_setup(void)
 {
        const struct rb_info *info;
-       char buf[64];
+       char buf[RBSPI_MACH_BUFLEN] = "MikroTik ";
+       char *str;
+       int len = RBSPI_MACH_BUFLEN - strlen(buf) - 1;
 
        info = rb_init_info((void *)(KSEG1ADDR(AR71XX_SPI_BASE)), 0x20000);
        if (!info)
-               return -ENODEV;
+               return NULL;
+
+       if (info->board_name) {
+               str = "RouterBOARD ";
+               if (strncmp(info->board_name, str, strlen(str))) {
+                       strncat(buf, str, len);
+                       len -= strlen(str);
+               }
+               strncat(buf, info->board_name, len);
+       }
+       else
+               strncat(buf, "UNKNOWN", len);
 
-       scnprintf(buf, sizeof(buf), "MikroTik %s",
-               (info->board_name) ? info->board_name : "");
        mips_set_machine_name(buf);
 
        /* fix partitions based on flash parsing */
        rbspi_init_partitions(info);
 
-       return 0;
+       return info;
 }
 
 /*
@@ -478,6 +740,9 @@ static void __init rbspi_peripherals_setup(u32 flags)
 
        if (flags & RBSPI_HAS_USB)
                ath79_register_usb();
+
+       if (flags & RBSPI_HAS_PCI)
+               ath79_register_pci();
 }
 
 /*
@@ -520,13 +785,21 @@ static void __init rbspi_network_setup(u32 flags, int gmac1_offset,
        ath79_register_eth(1);
 
        if (flags & RBSPI_HAS_WLAN0)
-               rbspi_wlan_init(0, wmac0_offset);
+               rbspi_wlan_init(wmac0_offset);
 
        if (flags & RBSPI_HAS_WLAN1)
-               rbspi_wlan_init(1, wmac1_offset);
+               rbspi_wlan_init(wmac1_offset);
+}
+
+static __init void rbspi_register_reset_button(int gpio)
+{
+       rbspi_gpio_keys_reset[0].gpio = gpio;
+       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(rbspi_gpio_keys_reset),
+                                       rbspi_gpio_keys_reset);
 }
 
-/* 
+/*
  * Init the mAP lite hardware (QCA953x).
  * The mAP L-2nD (mAP lite) has a single ethernet port, connected to PHY0.
  * Trying to use GMAC0 in direct mode was unsucessful, so we're
@@ -537,7 +810,7 @@ static void __init rbmapl_setup(void)
 {
        u32 flags = RBSPI_HAS_WLAN0;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_peripherals_setup(flags);
@@ -548,9 +821,7 @@ static void __init rbmapl_setup(void)
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rbmapl_leds), rbmapl_leds);
 
        /* mAP lite has a single reset button as gpio 16 */
-       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(rbspi_gpio_keys_reset16),
-                                       rbspi_gpio_keys_reset16);
+       rbspi_register_reset_button(RBMAPL_GPIO_BTN_RESET);
 
        /* clear internal multiplexing */
        ath79_gpio_output_select(RBMAPL_GPIO_LED_ETH, AR934X_GPIO_OUT_GPIO);
@@ -568,7 +839,7 @@ static void __init rbhapl_setup(void)
 {
        u32 flags = RBSPI_HAS_WLAN0;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_peripherals_setup(flags);
@@ -579,13 +850,11 @@ static void __init rbhapl_setup(void)
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rbhapl_leds), rbhapl_leds);
 
        /* hAP lite has a single reset button as gpio 16 */
-       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(rbspi_gpio_keys_reset16),
-                                       rbspi_gpio_keys_reset16);
+       rbspi_register_reset_button(RBHAPL_GPIO_BTN_RESET);
 }
 
 /*
- * The hAP, hEX lite and hEX PoE lite share the same platform
+ * The hAP, hAP ac lite, hEX lite and hEX PoE lite share the same platform
  */
 static void __init rbspi_952_750r2_setup(u32 flags)
 {
@@ -594,13 +863,16 @@ static void __init rbspi_952_750r2_setup(u32 flags)
 
        rbspi_peripherals_setup(flags);
 
-       /* GMAC1 is HW MAC + 1, WLAN0 MAC IS HW MAC + 5 */
-       rbspi_network_setup(flags, 1, 5, 0);
+       /*
+        * GMAC1 is HW MAC + 1, WLAN0 MAC IS HW MAC + 5 (hAP),
+        * WLAN1 MAC IS HW MAC + 6 (hAP ac lite)
+        */
+       rbspi_network_setup(flags, 1, 5, 6);
 
        if (flags & RBSPI_HAS_USB)
-               gpio_request_one(RB952_GPIO_USB_POWER,
+               gpio_request_one(RB952_GPIO_USB_PWROFF, GPIOF_ACTIVE_LOW |
                                GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-                               "USB power");
+                               "USB power off");
 
        if (flags & RBSPI_HAS_POE)
                gpio_request_one(RB952_GPIO_POE_POWER,
@@ -610,28 +882,34 @@ static void __init rbspi_952_750r2_setup(u32 flags)
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rb952_leds), rb952_leds);
 
        /* These devices have a single reset button as gpio 16 */
-       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(rbspi_gpio_keys_reset16),
-                                       rbspi_gpio_keys_reset16);
+       rbspi_register_reset_button(RB952_GPIO_BTN_RESET);
 }
 
 /*
- * Init the hAP hardware (QCA953x).
+ * Init the hAP (ac lite) hardware (QCA953x).
  * The 951Ui-2nD (hAP) has 5 ethernet ports, with ports 2-5 being assigned
  * to LAN on the casing, and port 1 being assigned to "internet" (WAN).
  * Port 1 is connected to PHY4 (the ports are labelled in reverse physical
  * number), so the SoC can be set to connect GMAC0 to PHY4 and GMAC1 to the
  * internal switch for the LAN ports.
  * The device also has USB, PoE output and an SSR used for LED multiplexing.
+ * The 952Ui-5ac2nD (hAP ac lite) is nearly identical to the hAP, it adds a
+ * QCA9887 5GHz radio via PCI and moves 2.4GHz from WLAN0 to WLAN1.
  */
 static void __init rb952_setup(void)
 {
-       u32 flags = RBSPI_HAS_WLAN0 | RBSPI_HAS_WAN4 | RBSPI_HAS_USB |
+       u32 flags = RBSPI_HAS_WAN4 | RBSPI_HAS_USB |
                        RBSPI_HAS_SSR | RBSPI_HAS_POE;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
+       /* differentiate the hAP from the hAP ac lite */
+       if (strstr(mips_get_machine_name(), "952Ui-5ac2nD"))
+               flags |= RBSPI_HAS_WLAN1 | RBSPI_HAS_PCI;
+       else
+               flags |= RBSPI_HAS_WLAN0;
+
        rbspi_952_750r2_setup(flags);
 }
 
@@ -639,22 +917,87 @@ static void __init rb952_setup(void)
  * Init the hEX (PoE) lite hardware (QCA953x).
  * The 750UP r2 (hEX PoE lite) is nearly identical to the hAP, only without
  * WLAN. The 750 r2 (hEX lite) is nearly identical to the 750UP r2, only
- * without USB and POE. It shares the same bootloader board identifier.
+ * without USB and POE. The 750P Pbr2 (Powerbox) is nearly identical to hEX PoE
+ * lite, only without USB. It shares the same bootloader board identifier.
  */
 static void __init rb750upr2_setup(void)
 {
        u32 flags = RBSPI_HAS_WAN4 | RBSPI_HAS_SSR;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        /* differentiate the hEX lite from the hEX PoE lite */
        if (strstr(mips_get_machine_name(), "750UP r2"))
                flags |= RBSPI_HAS_USB | RBSPI_HAS_POE;
 
+       /* differentiate the Powerbox from the hEX lite */
+       else if (strstr(mips_get_machine_name(), "750P r2"))
+               flags |= RBSPI_HAS_POE;
+
        rbspi_952_750r2_setup(flags);
 }
 
+/*
+ * Init the hAP ac / 962UiGS-5HacT2HnT hardware (QCA9558).
+ * The hAP ac has 5 ethernet ports provided by an AR8337 switch. Port 1 is
+ * assigned to WAN, ports 2-5 are assigned to LAN. Port 0 is connected to the
+ * SoC, ports 1-5 of the switch are connected to physical ports 1-5 in order.
+ * The SFP cage is not assigned by default on RouterOS. Extra work is required
+ * to support this interface as it is directly connected to the SoC (eth1).
+ * Wireless is provided by a 2.4GHz radio on the SoC (WLAN1) and a 5GHz radio
+ * attached via PCI (QCA9880). Red and green WLAN LEDs are populated however
+ * they are not attached to GPIOs, extra work is required to support these.
+ * PoE and USB output power control is supported.
+ */
+static void __init rb962_setup(void)
+{
+       u32 flags = RBSPI_HAS_USB | RBSPI_HAS_POE | RBSPI_HAS_PCI;
+
+       if (!rbspi_platform_setup())
+               return;
+
+       rbspi_peripherals_setup(flags);
+
+       /* Do not call rbspi_network_setup as we have a discrete switch chip */
+       ath79_eth0_pll_data.pll_1000 = 0xae000000;
+       ath79_eth0_pll_data.pll_100 = 0xa0000101;
+       ath79_eth0_pll_data.pll_10 = 0xa0001313;
+
+       ath79_register_mdio(0, 0x0);
+       mdiobus_register_board_info(rb962_mdio0_info,
+                                       ARRAY_SIZE(rb962_mdio0_info));
+
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+       ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+       ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+       ath79_eth0_data.phy_mask = BIT(0);
+       ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+       ath79_register_eth(0);
+
+       /* WLAN1 MAC is HW MAC + 7 */
+       rbspi_wlan_init(7);
+
+       if (flags & RBSPI_HAS_USB)
+               gpio_request_one(RB962_GPIO_USB_PWROFF, GPIOF_ACTIVE_LOW |
+                               GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                               "USB power off");
+
+       /* PoE output GPIO is inverted, set GPIOF_ACTIVE_LOW for consistency */
+       if (flags & RBSPI_HAS_POE)
+               gpio_request_one(RB962_GPIO_POE_POWER,
+                               GPIOF_OUT_INIT_HIGH | GPIOF_ACTIVE_LOW |
+                                       GPIOF_EXPORT_DIR_FIXED,
+                               "POE power");
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(rb962_leds_gpio),
+                               rb962_leds_gpio);
+
+       /* This device has a single reset button as gpio 20 */
+       rbspi_register_reset_button(RB962_GPIO_BTN_RESET);
+}
+
 /*
  * Init the LHG hardware (AR9344).
  * The LHG 5nD has a single ethernet port connected to PHY0.
@@ -664,7 +1007,7 @@ static void __init rblhg_setup(void)
 {
        u32 flags = RBSPI_HAS_WLAN1 | RBSPI_HAS_MDIO1;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_peripherals_setup(flags);
@@ -674,20 +1017,18 @@ static void __init rblhg_setup(void)
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rblhg_leds), rblhg_leds);
 
-       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(rblhg_gpio_keys),
-                                       rblhg_gpio_keys);
+       rbspi_register_reset_button(RBLHG_GPIO_BTN_RESET);
 }
 
 /*
- * Init the wAP hardware (EXPERIMENTAL).
+ * Init the wAP hardware.
  * The wAP 2nD has a single ethernet port.
  */
 static void __init rbwap_setup(void)
 {
        u32 flags = RBSPI_HAS_WLAN0;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_peripherals_setup(flags);
@@ -696,6 +1037,9 @@ static void __init rbwap_setup(void)
        rbspi_network_setup(flags, 0, 1, 0);
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rbwap_leds), rbwap_leds);
+
+       /* wAP has a single reset button as GPIO 16 */
+       rbspi_register_reset_button(RBWAP_GPIO_BTN_RESET);
 }
 
 /*
@@ -706,7 +1050,7 @@ static void __init rbcap_setup(void)
 {
        u32 flags = RBSPI_HAS_WLAN0;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_peripherals_setup(flags);
@@ -722,15 +1066,16 @@ static void __init rbcap_setup(void)
 }
 
 /*
- * Init the mAP hardware (EXPERIMENTAL).
- * The mAP 2nD has two ethernet ports, PoE output and an SSR for LED
- * multiplexing.
+ * Init the mAP hardware.
+ * The mAP 2nD has two ethernet ports, PoE output, SSR for LED
+ * multiplexing and USB port.
  */
 static void __init rbmap_setup(void)
 {
-       u32 flags = RBSPI_HAS_WLAN0 | RBSPI_HAS_SSR | RBSPI_HAS_POE;
+       u32 flags = RBSPI_HAS_USB | RBSPI_HAS_WLAN0 |
+                       RBSPI_HAS_SSR | RBSPI_HAS_POE;
 
-       if (rbspi_platform_setup())
+       if (!rbspi_platform_setup())
                return;
 
        rbspi_spi_cs_gpios[1] = RBMAP_GPIO_SSR_CS;
@@ -741,18 +1086,177 @@ static void __init rbmap_setup(void)
 
        if (flags & RBSPI_HAS_POE)
                gpio_request_one(RBMAP_GPIO_POE_POWER,
-                               GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                               GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
                                "POE power");
 
+       if (flags & RBSPI_HAS_USB)
+               gpio_request_one(RBMAP_GPIO_USB_PWROFF,
+                               GPIOF_OUT_INIT_HIGH | GPIOF_ACTIVE_LOW |
+                                       GPIOF_EXPORT_DIR_FIXED,
+                               "USB power off");
+
        ath79_register_leds_gpio(-1, ARRAY_SIZE(rbmap_leds), rbmap_leds);
+
+       /* mAP 2nD has a single reset button as gpio 16 */
+       rbspi_register_reset_button(RBMAP_GPIO_BTN_RESET);
+}
+
+/*
+ * Init the wAPGSC (RB wAPG-5HacT2HnD // wAP AC) hardware.
+ * The wAPGSC has one Ethernet port via AR8033 with PoE input, dual radio (SoC
+ * 2.4 GHz and external QCA9880) and a ZT2046Q temperature and voltage sensor
+ * (currently not supported).
+ */
+static void __init rbwapgsc_setup(void)
+{
+       u32 flags = RBSPI_HAS_PCI;
+
+       if (!rbspi_platform_setup())
+               return;
+
+       rbspi_peripherals_setup(flags);
+
+       platform_device_register(&rbwapgsc_phy_device);
+
+       mdiobus_register_board_info(rbwapgsc_mdio_info,
+                                   ARRAY_SIZE(rbwapgsc_mdio_info));
+
+       ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+       ath79_eth1_data.mii_bus_dev = &rbwapgsc_phy_device.dev;
+       ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+       ath79_eth1_data.phy_mask = BIT(RBWAPGSC_MDIO_PHYADDR);
+       ath79_eth1_data.enable_sgmii_fixup = 1;
+       ath79_eth1_pll_data.pll_1000 = 0x03000101;
+       ath79_eth1_pll_data.pll_100 = 0x80000101;
+       ath79_eth1_pll_data.pll_10 = 0x80001313;
+       ath79_eth1_data.speed = SPEED_1000;
+       ath79_eth1_data.duplex = DUPLEX_FULL;
+       ath79_register_eth(1);
+
+       rbspi_wlan_init(2);
+
+       rbspi_register_reset_button(RBWAPGSC_GPIO_BTN_RESET);
+
+       ath79_gpio_function_enable(QCA955X_GPIO_FUNC_JTAG_DISABLE|
+                               QCA955X_GPIO_REG_OUT_FUNC4|
+                               QCA955X_GPIO_REG_OUT_FUNC3);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(rbwapgsc_leds),
+                       rbwapgsc_leds);
+}
+
+/*
+ * Setup the 911L hardware (AR9344).
+ */
+static void __init rb911l_setup(void)
+{
+       const struct rb_info *info;
+
+       info = rbspi_platform_setup();
+       if (!info)
+               return;
+
+       if (!rb_has_hw_option(info, RB_HW_OPT_NO_NAND)) {
+               /*
+                * Old hardware revisions might be equipped with a NAND flash
+                * chip instead of the 16MiB SPI NOR device. Those boards are
+                * not supported at the moment, so throw a warning and skip
+                * the peripheral setup to avoid messing up the data in the
+                * flash chip.
+                */
+               WARN(1, "The NAND flash on this board is not supported.\n");
+       } else {
+               rbspi_peripherals_setup(0);
+       }
+
+       ath79_register_mdio(1, 0x0);
+
+       ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+
+       ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+       ath79_eth1_data.speed = SPEED_1000;
+       ath79_eth1_data.duplex = DUPLEX_FULL;
+
+       ath79_register_eth(1);
+
+       rbspi_wlan_init(1);
+
+       rbspi_register_reset_button(RB911L_GPIO_BTN_RESET);
+
+       /* Make the eth LED controllable by software. */
+       ath79_gpio_output_select(RB911L_GPIO_LED_ETH, AR934X_GPIO_OUT_GPIO);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(rb911l_leds), rb911l_leds);
+}
+
+/*
+ * Init the hAP mini hardware (QCA953x).
+ * The 931-2nD (hAP mini) has 3 ethernet ports, with port 2-3
+ * being assigned to LAN on the casing, and port 1 being assigned
+ * to "internet" (WAN) on the casing. Port 1 is connected to PHY2.
+ * Since WAN is neither PHY0 nor PHY4, we cannot use GMAC0 with this device.
+ */
+static void __init rb931_setup(void)
+{
+       u32 flags = RBSPI_HAS_WLAN0;
+
+       if (!rbspi_platform_setup())
+               return;
+
+       rbspi_peripherals_setup(flags);
+
+       /* GMAC1 is HW MAC, WLAN0 MAC is HW MAC + 3 */
+       rbspi_network_setup(flags, 0, 3, 0);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(rb931_leds), rb931_leds);
+
+       /* hAP mini has two buttons */
+       ath79_register_gpio_keys_polled(-1, RBSPI_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(rb931_gpio_keys),
+                                       rb931_gpio_keys);
 }
 
+/*
+ * Init the wAP R hardware.
+ * The wAP R-2nD has a single ethernet port and a mini PCIe slot.
+ * The OEM source shows it has usb (used over PCIe for LTE devices),
+ * and the 'control' GPIO is assumed to be an output pin not tied to an LED.
+ */
+static void __init rbwapr_setup(void)
+{
+       u32 flags = RBSPI_HAS_WLAN0 | RBSPI_HAS_USB | RBSPI_HAS_PCI;
+
+       if (!rbspi_platform_setup())
+               return;
+
+       rbspi_peripherals_setup(flags);
+
+       /* GMAC1 is HW MAC, WLAN0 MAC is HW MAC + 1 */
+       rbspi_network_setup(flags, 0, 1, 0);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(rbwapr_leds), rbwapr_leds);
+
+       gpio_request_one(RBWAPR_GPIO_PCIE_PWROFF, GPIOF_OUT_INIT_HIGH |
+                       GPIOF_ACTIVE_LOW | GPIOF_EXPORT_DIR_FIXED,
+                       "PCIE power off");
+
+       gpio_request_one(RBWAPR_GPIO_CONTROL, GPIOF_OUT_INIT_LOW |
+                       GPIOF_ACTIVE_LOW | GPIOF_EXPORT_DIR_FIXED,
+                       "control");
+
+       rbspi_register_reset_button(RBWAPR_GPIO_BTN_RESET);
+}
 
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_MAPL, "map-hb", rbmapl_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_941, "H951L", rbhapl_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_911L, "911L", rb911l_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_952, "952-hb", rb952_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_962, "962", rb962_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_750UPR2, "750-hb", rb750upr2_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_LHG5, "lhg", rblhg_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_WAP, "wap-hb", rbwap_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_WAPR, "wap-lte", rbwapr_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_CAP, "cap-hb", rbcap_setup);
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_MAP, "map2-hb", rbmap_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_WAPAC, "wapg-sc", rbwapgsc_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_931, "931", rb931_setup);