wireguard-tools: add tunlink option for hostroute

[openwrt/staging/chunkeey.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wndr4300.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
index 6f26429ed79fa9e3cbe47f6aa38aad0c0f3ae953..339216da1bbf7bef8d5bd7170d13bdcdde92a213 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -1,5 +1,5 @@
 /*
- *  NETGEAR WNDR4300 board support
+ *  NETGEAR WNDR3700v4/WNDR4300 board support
  *
  *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2014 Ralph Perlich <rpsoft@arcor.de>
@@ -9,6 +9,7 @@
  *  by the Free Software Foundation.
  */
 
+#include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/phy.h>
 #include <linux/gpio.h>
@@ -16,7 +17,11 @@
 #include <linux/ath9k_platform.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/platform/ar934x_nfc.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -31,6 +36,7 @@
 #include "dev-wmac.h"
 #include "machtypes.h"
 
+/* AR9344 GPIOs */
 #define WNDR4300_GPIO_LED_POWER_GREEN  0
 #define WNDR4300_GPIO_LED_POWER_AMBER  2
 #define WNDR4300_GPIO_LED_USB          13
@@ -45,6 +51,9 @@
 #define WNDR4300_GPIO_BTN_WIRELESS     15
 #define WNDR4300_GPIO_BTN_WPS          12
 
+/* AR9580 GPIOs */
+#define WNDR4300_GPIO_USB_5V           0
+
 #define WNDR4300_KEYS_POLL_INTERVAL    20      /* msecs */
 #define WNDR4300_KEYS_DEBOUNCE_INTERVAL        (3 * WNDR4300_KEYS_POLL_INTERVAL)
 
@@ -98,7 +107,7 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = {
 
 static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
        {
-               .desc           = "Reset button",
+               .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
@@ -106,7 +115,7 @@ static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "WPS button",
+               .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
@@ -114,9 +123,9 @@ static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "Wireless button",
+               .desc           = "rfkill",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RFKILL,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNDR4300_GPIO_BTN_WIRELESS,
                .active_low     = 1,
@@ -132,11 +141,11 @@ static struct ar8327_pad_cfg wndr4300_ar8327_pad0_cfg = {
 };
 
 static struct ar8327_led_cfg wndr4300_ar8327_led_cfg = {
-       .led_ctrl0 = 0xc737c737,
-       .led_ctrl1 = 0x00000000,
+       .led_ctrl0 = 0xcc35cc35,
+       .led_ctrl1 = 0xcb37cb37,
        .led_ctrl2 = 0x00000000,
-       .led_ctrl3 = 0x0030c300,
-       .open_drain = false,
+       .led_ctrl3 = 0x00f3cf00,
+       .open_drain = true,
 };
 
 static struct ar8327_platform_data wndr4300_ar8327_data = {
@@ -154,7 +163,7 @@ static struct ar8327_platform_data wndr4300_ar8327_data = {
 static struct mdio_board_info wndr4300_mdio0_info[] = {
        {
                .bus_id = "ag71xx-mdio.0",
-               .phy_addr = 0,
+               .mdio_addr = 0,
                .platform_data = &wndr4300_ar8327_data,
        },
 };
@@ -192,8 +201,15 @@ static void __init wndr4300_setup(void)
        ath79_register_usb();
 
        ath79_register_wmac_simple();
+
+       /* enable power for the USB port */
+       ap9x_pci_setup_wmac_gpio(0, BIT(WNDR4300_GPIO_USB_5V),
+                                BIT(WNDR4300_GPIO_USB_5V));
+
        ap91_pci_init_simple();
 }
 
+MIPS_MACHINE(ATH79_MACH_WNDR3700_V4, "WNDR3700_V4", "NETGEAR WNDR3700v4",
+            wndr4300_setup);
 MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR4300",
             wndr4300_setup);