diff options
| -rwxr-xr-x | target/linux/ar71xx/base-files/etc/board.d/01_leds | 5 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/etc/board.d/02_network | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/base-files/etc/diag.sh | 3 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 7 | ||||
| -rw-r--r-- | target/linux/ar71xx/config-4.4 | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 13 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c | 279 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/mikrotik.mk | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/mikrotik/config-default | 1 |
12 files changed, 313 insertions, 4 deletions
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index ab8585c3f6..5aa49c98f5 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -236,6 +236,11 @@ rb-2011uias-2hnd) ucidef_set_led_switch "eth9" "ETH9" "rb:green:eth9" "switch1" "0x04" ucidef_set_led_switch "eth10" "ETH10" "rb:green:eth10" "switch1" "0x02" ;; +rb-mapl-2nd) + ucidef_set_led_default "power" "POWER" "rb:green:power" "1" + ucidef_set_led_netdev "lan" "LAN" "rb:green:eth" "eth0" + ucidef_set_led_wlan "wlan" "WLAN" "rb:green:wlan" "phy0tpt" + ;; dap-2695-a1) ucidef_set_led_default "power" "POWER" "d-link:green:power" "1" ucidef_set_led_default "diag" "DIAG" "d-link:red:power" "0" diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 14bb34b898..f3dcd907e3 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -90,6 +90,7 @@ ar71xx_setup_interfaces() rb-911g-5hpnd|\ rb-912uag-2hpnd|\ rb-912uag-5hpnd|\ + rb-mapl-2nd|\ rb-sxt2n|\ rb-sxt5n|\ re450|\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index a407a9979d..f9d394ba34 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -297,7 +297,8 @@ get_status_led() { rb-911g-5hpacd|\ rb-911g-5hpnd|\ rb-912uag-2hpnd|\ - rb-912uag-5hpnd) + rb-912uag-5hpnd|\ + rb-mapl-2nd) status_led="rb:green:user" ;; rb-951ui-2hnd | rb-941-2nd) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index d51260df7b..066f8eb17f 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -883,6 +883,9 @@ ar71xx_board_detect() { *"RouterBOARD 2011UiAS-2HnD") name="rb-2011uias-2hnd" ;; + *"RouterBOARD mAP L-2nD") + name="rb-mapl-2nd" + ;; *"RouterBOARD SXT Lite2") name="rb-sxt2n" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index f227bf8d18..43515fe93a 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -344,6 +344,7 @@ platform_check_image() { pb42|\ pb44|\ rb-941-2nd|\ + rb-mapl-2nd|\ routerstation-pro|\ routerstation|\ wp543|\ @@ -615,7 +616,8 @@ platform_pre_upgrade() { local board=$(ar71xx_board_name) case "$board" in - rb-941-2nd) + rb-941-2nd|\ + rb-mapl-2nd) ;; rb*|\ c-60|\ @@ -651,7 +653,8 @@ platform_do_upgrade() { local board=$(ar71xx_board_name) case "$board" in - rb-941-2nd) + rb-941-2nd|\ + rb-mapl-2nd) PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD=1 platform_do_upgrade_combined "$ARGV" ;; diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 3902aeed5f..060931a8dd 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -149,6 +149,7 @@ CONFIG_ATH79_MACH_R6100=y # CONFIG_ATH79_MACH_RB922 is not set # CONFIG_ATH79_MACH_RB941 is not set # CONFIG_ATH79_MACH_RB95X is not set +# CONFIG_ATH79_MACH_RBSPI is not set # CONFIG_ATH79_MACH_RBSXTLITE is not set CONFIG_ATH79_MACH_RE450=y CONFIG_ATH79_MACH_RW2458N=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 14490e27f7..3474cb8f16 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -924,6 +924,19 @@ config ATH79_MACH_RB2011 select ATH79_DEV_WMAC select ATH79_ROUTERBOOT +config ATH79_MACH_RBSPI + bool "MikroTik RouterBOARD SPI-NOR support" + select SOC_QCA953X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + select ATH79_ROUTERBOOT + help + Say 'Y' here if you want your kernel to support the + MikroTik RouterBOARD mAP lite + config ATH79_MACH_RBSXTLITE bool "MikroTik RouterBOARD SXT Lite" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index aab8d6e8d0..e0748b1237 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -153,6 +153,7 @@ obj-$(CONFIG_ATH79_MACH_RB91X) += mach-rb91x.o obj-$(CONFIG_ATH79_MACH_RB922) += mach-rb922.o obj-$(CONFIG_ATH79_MACH_RB941) += mach-rb941.o obj-$(CONFIG_ATH79_MACH_RB95X) += mach-rb95x.o +obj-$(CONFIG_ATH79_MACH_RBSPI) += mach-rbspi.o obj-$(CONFIG_ATH79_MACH_RBSXTLITE) += mach-rbsxtlite.o obj-$(CONFIG_ATH79_MACH_RE450) += mach-re450.o obj-$(CONFIG_ATH79_MACH_RW2458N) += mach-rw2458n.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c new file mode 100644 index 0000000000..3f154b4775 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c @@ -0,0 +1,279 @@ +/* + * MikroTik SPI-NOR RouterBOARDs support + * + * - MikroTik RouterBOARD mAP L-2nD + * + * Copyright (C) 2017 Thibaut VARENE <varenet@parisc-linux.org> + * + * 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/platform_device.h> +#include <linux/phy.h> +#include <linux/routerboot.h> +#include <linux/gpio.h> + +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> + +#include <asm/prom.h> +#include <asm/mach-ath79/ar71xx_regs.h> +#include <asm/mach-ath79/ath79.h> + +#include "common.h" +#include "dev-eth.h" +#include "dev-spi.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" +#include "routerboot.h" + +#define RBSPI_KEYS_POLL_INTERVAL 20 /* msecs */ +#define RBSPI_KEYS_DEBOUNCE_INTERVAL (3 * RBSPI_KEYS_POLL_INTERVAL) + +#define RBSPI_HAS_USB BIT(0) +#define RBSPI_HAS_WLAN BIT(1) +#define RBSPI_HAS_WAN4 BIT(2) /* has WAN port on PHY4 */ + +#define RB_ROUTERBOOT_OFFSET 0x0000 +#define RB_BIOS_SIZE 0x1000 +#define RB_SOFT_CFG_SIZE 0x1000 +#define RB_KERNEL_SIZE (2 * 1024 * 1024) /* 2MB kernel */ + +/* Flash partitions indexes */ +enum { + RBSPI_PART_RBOOT, + RBSPI_PART_HCONF, + RBSPI_PART_BIOS, + RBSPI_PART_RBOOT2, + RBSPI_PART_SCONF, + RBSPI_PART_KERN, + RBSPI_PART_ROOT, + RBSPI_PARTS +}; + +static struct mtd_partition rbspi_spi_partitions[RBSPI_PARTS]; + +/* + * Setup the SPI flash partition table based on initial parsing. + * The kernel can be at any aligned position and have any size. + * The size of the kernel partition is the desired RB_KERNEL_SIZE + * minus the size of the preceding partitions (128KB). + */ +static void __init rbspi_init_partitions(const struct rb_info *info) +{ + struct mtd_partition *parts = rbspi_spi_partitions; + memset(parts, 0x0, sizeof(*parts)); + + parts[RBSPI_PART_RBOOT].name = "routerboot"; + parts[RBSPI_PART_RBOOT].offset = RB_ROUTERBOOT_OFFSET; + parts[RBSPI_PART_RBOOT].size = info->hard_cfg_offs; + parts[RBSPI_PART_RBOOT].mask_flags = MTD_WRITEABLE; + + parts[RBSPI_PART_HCONF].name = "hard_config"; + parts[RBSPI_PART_HCONF].offset = info->hard_cfg_offs; + parts[RBSPI_PART_HCONF].size = info->hard_cfg_size; + parts[RBSPI_PART_HCONF].mask_flags = MTD_WRITEABLE; + + parts[RBSPI_PART_BIOS].name = "bios"; + parts[RBSPI_PART_BIOS].offset = info->hard_cfg_offs + + info->hard_cfg_size; + parts[RBSPI_PART_BIOS].size = RB_BIOS_SIZE; + parts[RBSPI_PART_BIOS].mask_flags = MTD_WRITEABLE; + + parts[RBSPI_PART_RBOOT2].name = "routerboot2"; + parts[RBSPI_PART_RBOOT2].offset = parts[RBSPI_PART_BIOS].offset + + RB_BIOS_SIZE; + parts[RBSPI_PART_RBOOT2].size = info->soft_cfg_offs + - parts[RBSPI_PART_RBOOT2].offset; + parts[RBSPI_PART_RBOOT2].mask_flags = MTD_WRITEABLE; + + parts[RBSPI_PART_SCONF].name = "soft_config"; + parts[RBSPI_PART_SCONF].offset = info->soft_cfg_offs; + parts[RBSPI_PART_SCONF].size = RB_SOFT_CFG_SIZE; + + parts[RBSPI_PART_KERN].name = "kernel"; + parts[RBSPI_PART_KERN].offset = parts[RBSPI_PART_SCONF].offset + + parts[RBSPI_PART_SCONF].size; + parts[RBSPI_PART_KERN].size = RB_KERNEL_SIZE + - parts[RBSPI_PART_KERN].offset; + + parts[RBSPI_PART_ROOT].name = "rootfs"; + parts[RBSPI_PART_ROOT].offset = parts[RBSPI_PART_KERN].offset + + parts[RBSPI_PART_KERN].size; + parts[RBSPI_PART_ROOT].size = MTDPART_SIZ_FULL; +} + +static struct flash_platform_data rbspi_spi_flash_data = { + .parts = rbspi_spi_partitions, + .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 = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = RBSPI_KEYS_DEBOUNCE_INTERVAL, + .gpio = RBSPI_GPIO_BTN_RESET16, + .active_low = 1, + }, +}; + +/* RB mAP L-2nD gpios */ +#define RBMAPL_GPIO_LED_POWER 17 +#define RBMAPL_GPIO_LED_USER 14 +#define RBMAPL_GPIO_LED_ETH 4 +#define RBMAPL_GPIO_LED_WLAN 11 + +static struct gpio_led rbmapl_leds[] __initdata = { + { + .name = "rb:green:power", + .gpio = RBMAPL_GPIO_LED_POWER, + .active_low = 0, + .default_state = LEDS_GPIO_DEFSTATE_ON, + }, { + .name = "rb:green:user", + .gpio = RBMAPL_GPIO_LED_USER, + .active_low = 0, + }, { + .name = "rb:green:eth", + .gpio = RBMAPL_GPIO_LED_ETH, + .active_low = 0, + }, { + .name = "rb:green:wlan", + .gpio = RBMAPL_GPIO_LED_WLAN, + .active_low = 0, + }, +}; + +void __init rbspi_wlan_init(int wmac_offset) +{ + char *art_buf; + u8 wlan_mac[ETH_ALEN]; + + art_buf = rb_get_wlan_data(); + if (!art_buf) + return; + + ath79_init_mac(wlan_mac, ath79_mac_base, wmac_offset); + ath79_register_wmac(art_buf + 0x1000, wlan_mac); + + kfree(art_buf); +} + +/* + * Common platform init routine for all SPI NOR devices. + */ +static int __init rbspi_platform_setup(void) +{ + const struct rb_info *info; + char buf[64]; + + info = rb_init_info((void *)(KSEG1ADDR(AR71XX_SPI_BASE)), 0x20000); + if (!info) + return -ENODEV; + + 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; +} + +/* + * Common peripherals init routine for all SPI NOR devices. + * Sets SPI and USB. + */ +static void __init rbspi_peripherals_setup(u32 flags) +{ + ath79_register_m25p80(&rbspi_spi_flash_data); + + if (flags & RBSPI_HAS_USB) + ath79_register_usb(); +} + +/* + * Common network init routine for all SPI NOR devices. + * Sets LAN/WAN/WLAN. + */ +static void __init rbspi_network_setup(u32 flags, int gmac1_offset, + int wmac_offset) +{ + /* for QCA953x that will init mdio1_device/data */ + ath79_register_mdio(0, 0x0); + + if (flags & RBSPI_HAS_WAN4) { + ath79_setup_ar934x_eth_cfg(0); + + /* set switch to oper mode 1, PHY4 connected to CPU */ + ath79_switch_data.phy4_mii_en = 1; + ath79_switch_data.phy_poll_mask |= BIT(4); + + /* init GMAC0 connected to PHY4 at 100M */ + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; + ath79_eth0_data.phy_mask = BIT(4); + ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0); + ath79_register_eth(0); + } else { + /* set the SoC to SW_ONLY_MODE, which connects all PHYs + * to the internal switch. + * We hijack ath79_setup_ar934x_eth_cfg() to set the switch in + * the QCA953x, this works because this configuration bit is + * the same as the AR934x. There's no equivalent function for + * QCA953x for now. */ + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE); + } + + /* init GMAC1 */ + ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, gmac1_offset); + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; + ath79_register_eth(1); + + if (flags & RBSPI_HAS_WLAN) + rbspi_wlan_init(wmac_offset); +} + +/* + * Init the mAP lite hardware. + * 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 + * using SW_ONLY_MODE, which connects PHY0 to MAC1 on the internal + * switch, which is connected to GMAC1 on the SoC. GMAC0 is unused. + */ +static void __init rbmapl_setup(void) +{ + u32 flags = RBSPI_HAS_WLAN; + + if (rbspi_platform_setup()) + return; + + rbspi_peripherals_setup(flags); + + /* GMAC1 is HW MAC, WLAN MAC is HW MAC + 1 */ + rbspi_network_setup(flags, 0, 1); + + 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); + + /* clear internal multiplexing */ + ath79_gpio_output_select(RBMAPL_GPIO_LED_ETH, AR934X_GPIO_OUT_GPIO); + ath79_gpio_output_select(RBMAPL_GPIO_LED_POWER, AR934X_GPIO_OUT_GPIO); +} + +MIPS_MACHINE_NONAME(ATH79_MACH_RB_MAPL, "map-hb", rbmapl_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 00ceef3c23..706663ca11 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -173,6 +173,7 @@ enum ath79_mach_type { ATH79_MACH_RB_941, /* MikroTik RouterBOARD 941-2nD */ ATH79_MACH_RB_951G, /* Mikrotik RouterBOARD 951G */ ATH79_MACH_RB_951U, /* Mikrotik RouterBOARD 951Ui-2HnD */ + ATH79_MACH_RB_MAPL, /* Mikrotik RouterBOARD mAP L-2nD */ ATH79_MACH_RB_SXTLITE2ND, /* Mikrotik RouterBOARD SXT Lite 2nD */ ATH79_MACH_RB_SXTLITE5ND, /* Mikrotik RouterBOARD SXT Lite 5nD */ ATH79_MACH_RE450, /* TP-LINK RE450 */ diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index 939544d764..bcfa768dd7 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -25,7 +25,7 @@ endef TARGET_DEVICES += nand-64m nand-large define Device/rb-nor-flash-16M - DEVICE_TITLE := MikroTik RouterBoard with 16 MB NOR flash + DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash DEVICE_PACKAGES := rbcfg BLOCKSIZE := 64k IMAGE_SIZE := 16000k diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index a55952d793..a8af0e721e 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -114,6 +114,7 @@ CONFIG_ATH79_MACH_RB91X=y CONFIG_ATH79_MACH_RB922=y CONFIG_ATH79_MACH_RB941=y CONFIG_ATH79_MACH_RB95X=y +CONFIG_ATH79_MACH_RBSPI=y CONFIG_ATH79_MACH_RBSXTLITE=y # CONFIG_ATH79_MACH_RE450 is not set # CONFIG_ATH79_MACH_RW2458N is not set |