From: Thibaut VARENE <ha...@slashdirt.org>
This patch implements support for the hAP lite in mach-rbxap.c
hAP lite was supported via mach-rb941.c, so this file is removed
as well as the corresponding build bits.
v2 fixes WLAN MAC offset and a comment grammar issue.
Signed-off-by: Thibaut VARENE <ha...@slashdirt.org>
---
target/linux/ar71xx/config-4.4 | 1 -
.../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 11 +-
.../ar71xx/files/arch/mips/ath79/mach-rb941.c | 173 ---------------------
.../ar71xx/files/arch/mips/ath79/mach-rbxap.c | 28 ++++
target/linux/ar71xx/image/mikrotik.mk | 9 +-
target/linux/ar71xx/mikrotik/config-default | 1 -
6 files changed, 30 insertions(+), 193 deletions(-)
delete mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-rb941.c
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index 20f1f0b..1fb1bd6 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -146,7 +146,6 @@ CONFIG_ATH79_MACH_R6100=y
# CONFIG_ATH79_MACH_RB750 is not set
# CONFIG_ATH79_MACH_RB91X is not set
# CONFIG_ATH79_MACH_RB922 is not set
-# CONFIG_ATH79_MACH_RB941 is not set
# CONFIG_ATH79_MACH_RB95X is not set
# CONFIG_ATH79_MACH_RBXAP is not set
# CONFIG_ATH79_MACH_RBSXTLITE is not set
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 0378fed..1be6799 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -885,16 +885,6 @@ config ATH79_MACH_RB922
select ATH79_ROUTERBOOT
select RLE_DECOMPRESS
-config ATH79_MACH_RB941
- bool "MikroTik RouterBOARD 941-2nd 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
-
config ATH79_MACH_RB95X
bool "MikroTik RouterBOARD 95X support"
select SOC_AR934X
@@ -926,6 +916,7 @@ config ATH79_MACH_RBXAP
help
Say 'Y' here if you want your kernel to support the
MikroTik RouterBOARD mAP lite
+ MikroTik RouterBOARD hAP lite
config ATH79_MACH_RBSXTLITE
bool "MikroTik RouterBOARD SXT Lite"
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb941.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb941.c
deleted file mode 100644
index 5da950b..0000000
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb941.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * MikroTik RouterBOARD 941-2nD support
- *
- * Copyright (C) 2016 Sergey Sergeev <ad...@yapic.net>
- *
- * 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/export.h>
-#include <linux/pci.h>
-#include <linux/ath9k_platform.h>
-#include <linux/platform_device.h>
-#include <linux/phy.h>
-#include <linux/ar8216_platform.h>
-#include <linux/rle.h>
-#include <linux/routerboot.h>
-#include <linux/gpio.h>
-
-#include <linux/mtd/mtd.h>
-//#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/mach-ath79/ar71xx_regs.h>
-#include <asm/mach-ath79/ath79.h>
-#include <asm/mach-ath79/irq.h>
-
-#include "common.h"
-#include "dev-ap9x-pci.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 RB941_GPIO_LED_ACT 14
-#define RB941_GPIO_BTN_RESET 16
-
-#define RB941_KEYS_POLL_INTERVAL 20 /* msecs */
-#define RB941_KEYS_DEBOUNCE_INTERVAL (3 * RB941_KEYS_POLL_INTERVAL)
-
-#define RB_ROUTERBOOT_OFFSET 0x0000
-#define RB_ROUTERBOOT_SIZE 0xe000
-#define RB_HARD_CFG_OFFSET 0xe000
-#define RB_HARD_CFG_SIZE 0x1000
-#define RB_BIOS_OFFSET 0xf000
-#define RB_BIOS_SIZE 0x1000
-#define RB_ROUTERBOOT2_OFFSET 0x10000
-#define RB_ROUTERBOOT2_SIZE 0xf000
-#define RB_SOFT_CFG_OFFSET 0x1f000
-#define RB_SOFT_CFG_SIZE 0x1000
-#define RB_ROOTFS_OFFSET 0x20000
-#define RB_ROOTFS_SIZE 0x9e0000
-#define RB_KERNEL_OFFSET 0xa00000
-#define RB_KERNEL_SIZE MTDPART_SIZ_FULL
-
-void __init rb941_wlan_init(void)
-{
- char *art_buf;
- u8 wlan_mac[ETH_ALEN];
-
- art_buf = rb_get_wlan_data();
- if (art_buf == NULL)
- return;
-
- ath79_init_mac(wlan_mac, ath79_mac_base, 11);
- ath79_register_wmac(art_buf + 0x1000, wlan_mac);
-
- kfree(art_buf);
-}
-
-static struct mtd_partition rb941_spi_partitions[] = {
- {
- .name = "routerboot",
- .offset = RB_ROUTERBOOT_OFFSET,
- .mask_flags = MTD_WRITEABLE,
- .size = RB_ROUTERBOOT_SIZE,
- }, {
- .name = "hard_config",
- .offset = RB_HARD_CFG_OFFSET,
- .size = RB_HARD_CFG_SIZE,
- .mask_flags = MTD_WRITEABLE,
- }, {
- .name = "bios",
- .offset = RB_BIOS_OFFSET,
- .size = RB_BIOS_SIZE,
- .mask_flags = MTD_WRITEABLE,
- }, {
- .name = "routerboot2",
- .offset = RB_ROUTERBOOT2_OFFSET,
- .size = RB_ROUTERBOOT2_SIZE,
- .mask_flags = MTD_WRITEABLE,
- }, {
- .name = "soft_config",
- .offset = RB_SOFT_CFG_OFFSET,
- .size = RB_SOFT_CFG_SIZE,
- }, {
- .name = "rootfs",
- .offset = RB_ROOTFS_OFFSET,
- .size = RB_ROOTFS_SIZE,
- }, {
- .name = "kernel",
- .offset = RB_KERNEL_OFFSET,
- .size = RB_KERNEL_SIZE,
- }
-};
-
-static struct flash_platform_data rb941_spi_flash_data = {
- .parts = rb941_spi_partitions,
- .nr_parts = ARRAY_SIZE(rb941_spi_partitions),
-};
-
-static struct gpio_led rb941_leds[] __initdata = {
- {
- .name = "rb:green:act",
- .gpio = RB941_GPIO_LED_ACT,
- .active_low = 1,
- },
-};
-
-static struct gpio_keys_button rb941_gpio_keys[] __initdata = {
- {
- .desc = "Reset button",
- .type = EV_KEY,
- .code = KEY_RESTART,
- .debounce_interval = RB941_KEYS_DEBOUNCE_INTERVAL,
- .gpio = RB941_GPIO_BTN_RESET,
- .active_low = 1,
- },
-};
-
-static void __init rb941_setup(void)
-{
- const struct rb_info *info;
- //try to get rb_info data
- info = rb_init_info((void *)(KSEG1ADDR(AR71XX_SPI_BASE)), 0x20000);
- if (!info){
- pr_err("%s: Can't get rb_info data from flash!\n", __func__);
- //return -EINVAL; //Not critical ... continue!
- }
- ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
- ath79_register_m25p80(&rb941_spi_flash_data);
- ath79_register_mdio(0, 0x0);
-
- /* WAN. We have no WAN. Only LAN. */
- /*ath79_switch_data.phy4_mii_en = 1;
- ath79_switch_data.phy_poll_mask = BIT(4);
- 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); */
-
- /* LAN */
- ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
- ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- ath79_register_eth(1);
-
- //ath79_register_usb();
-
- rb941_wlan_init();
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(rb941_leds), rb941_leds);
- ath79_register_gpio_keys_polled(-1, RB941_KEYS_POLL_INTERVAL,
- ARRAY_SIZE(rb941_gpio_keys),
- rb941_gpio_keys);
-}
-
-MIPS_MACHINE(ATH79_MACH_RB_941, "H951L", "MikroTik RouterBOARD 941-2nD",
rb941_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbxap.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbxap.c
index 7d2f840..6e8f4ad 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbxap.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbxap.c
@@ -2,6 +2,7 @@
* MikroTik RouterBOARD *AP (SPI NOR) support
*
* - MikroTik RouterBOARD mAPL-2nD
+ * - MikroTik RouterBOARD 941L-2nD
*
* Copyright (C) 2017 Thibaut VARENE <vare...@parisc-linux.org>
*
@@ -143,6 +144,15 @@ static struct gpio_led rbmapl_leds[] __initdata = {
},
};
+#define RBHAPL_GPIO_LED_USER 14
+static struct gpio_led rbhapl_leds[] __initdata = {
+ {
+ .name = "rb:green:act",
+ .gpio = RBHAPL_GPIO_LED_USER,
+ .active_low = 1,
+ },
+};
+
static struct gpio_keys_button rbmapl_gpio_keys[] __initdata = {
{
.desc = "Reset button",
@@ -206,4 +216,22 @@ static void __init rbmapl_setup(void)
ath79_gpio_output_select(RBMAPL_GPIO_LED_POWER, 0);
}
+/* The 941-2nD (hAP lite) has 4 ethernet ports, with port 0-2
+ * being assigned to LAN on the casing, and port 3 being assigned
+ * to "internet" (WAN) on the casing. Since WAN is neither PHY0
+ * nor PHY4, we cannot use GMAC0 with this device either. */
+static void __init rbhapl_setup(void)
+{
+ if (rbxap_setup(4)) /* WLAN MAC is HW MAC + 4 */
+ return;
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(rbhapl_leds), rbhapl_leds);
+
+ /* hAP lite has the same reset button as the mAP lite */
+ ath79_register_gpio_keys_polled(-1, RBXAP_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(rbmapl_gpio_keys),
+ rbmapl_gpio_keys);
+}
+
MIPS_MACHINE_NONAME(ATH79_MACH_RB_MAPL, "map-hb", rbmapl_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_941, "H951L", rbhapl_setup);
diff --git a/target/linux/ar71xx/image/mikrotik.mk
b/target/linux/ar71xx/image/mikrotik.mk
index 257c618..f35f9ca 100644
--- a/target/linux/ar71xx/image/mikrotik.mk
+++ b/target/linux/ar71xx/image/mikrotik.mk
@@ -36,17 +36,10 @@ define Device/rb-nor-flash-16M
IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | combined-image |
check-size $$$$(IMAGE_SIZE)
endef
-define Device/rb-941-2nd
-$(Device/rb-nor-flash-16M)
- DEVICE_TITLE := hAP lite
- DEVICE_PACKAGES:= rbcfg
- BOARDNAME:= rb-941-2nd
-endef
-
define Device/rb-xap
$(Device/rb-nor-flash-16M)
DEVICE_TITLE := xAP devices
BOARDNAME:= rb-xap
endef
-TARGET_DEVICES += rb-nor-flash-16M rb-941-2nd rb-xap
+TARGET_DEVICES += rb-nor-flash-16M rb-xap
diff --git a/target/linux/ar71xx/mikrotik/config-default
b/target/linux/ar71xx/mikrotik/config-default
index 8db03f4..e0cc01b 100644
--- a/target/linux/ar71xx/mikrotik/config-default
+++ b/target/linux/ar71xx/mikrotik/config-default
@@ -112,7 +112,6 @@ CONFIG_ATH79_MACH_RB4XX=y
CONFIG_ATH79_MACH_RB750=y
CONFIG_ATH79_MACH_RB91X=y
CONFIG_ATH79_MACH_RB922=y
-CONFIG_ATH79_MACH_RB941=y
CONFIG_ATH79_MACH_RB95X=y
CONFIG_ATH79_MACH_RBXAP=y
CONFIG_ATH79_MACH_RBSXTLITE=y
--
2.1.4
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
