Author: blogic Date: 2014-11-14 17:54:07 +0100 (Fri, 14 Nov 2014) New Revision: 43258
Added: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c trunk/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-mr900-support.patch trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch Modified: trunk/target/linux/ar71xx/config-3.10 trunk/target/linux/ar71xx/config-3.14 Log: ar71xx: add kernel support for the OpenMesh MR900 board Signed-off-by: Sven Eckelmann <[email protected]> Modified: trunk/target/linux/ar71xx/config-3.10 =================================================================== --- trunk/target/linux/ar71xx/config-3.10 2014-11-14 16:53:58 UTC (rev 43257) +++ trunk/target/linux/ar71xx/config-3.10 2014-11-14 16:54:07 UTC (rev 43258) @@ -60,6 +60,7 @@ CONFIG_ATH79_MACH_JA76PF=y CONFIG_ATH79_MACH_JWAP003=y CONFIG_ATH79_MACH_MR600=y +CONFIG_ATH79_MACH_MR900=y CONFIG_ATH79_MACH_MYNET_N600=y CONFIG_ATH79_MACH_MYNET_N750=y CONFIG_ATH79_MACH_MYNET_REXT=y Modified: trunk/target/linux/ar71xx/config-3.14 =================================================================== --- trunk/target/linux/ar71xx/config-3.14 2014-11-14 16:53:58 UTC (rev 43257) +++ trunk/target/linux/ar71xx/config-3.14 2014-11-14 16:54:07 UTC (rev 43258) @@ -61,6 +61,7 @@ CONFIG_ATH79_MACH_JA76PF=y CONFIG_ATH79_MACH_JWAP003=y CONFIG_ATH79_MACH_MR600=y +CONFIG_ATH79_MACH_MR900=y CONFIG_ATH79_MACH_MYNET_N600=y CONFIG_ATH79_MACH_MYNET_N750=y CONFIG_ATH79_MACH_MYNET_REXT=y Added: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c (rev 0) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c 2014-11-14 16:54:07 UTC (rev 43258) @@ -0,0 +1,158 @@ +/* + * MR900 board support + * + * Copyright (c) 2012 Qualcomm Atheros + * Copyright (c) 2012-2013 Marek Lindner <[email protected]> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include <linux/platform_device.h> +#include <linux/ar8216_platform.h> +#include <linux/ath9k_platform.h> + +#include <asm/mach-ath79/ar71xx_regs.h> + +#include "common.h" +#include "dev-ap9x-pci.h" +#include "dev-gpio-buttons.h" +#include "dev-eth.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-wmac.h" +#include "machtypes.h" +#include "pci.h" + +#define MR900_GPIO_LED_LAN 12 +#define MR900_GPIO_LED_WLAN_2G 13 +#define MR900_GPIO_LED_STATUS_GREEN 19 +#define MR900_GPIO_LED_STATUS_RED 21 +#define MR900_GPIO_LED_POWER 22 +#define MR900_GPIO_LED_WLAN_5G 23 + +#define MR900_GPIO_BTN_RESET 17 + +#define MR900_KEYS_POLL_INTERVAL 20 /* msecs */ +#define MR900_KEYS_DEBOUNCE_INTERVAL (3 * MR900_KEYS_POLL_INTERVAL) + +#define MR900_MAC0_OFFSET 0 +#define MR900_WMAC_CALDATA_OFFSET 0x1000 +#define MR900_PCIE_CALDATA_OFFSET 0x5000 + +static struct gpio_led mr900_leds_gpio[] __initdata = { + { + .name = "mr900:blue:power", + .gpio = MR900_GPIO_LED_POWER, + .active_low = 1, + }, + { + .name = "mr900:blue:wan", + .gpio = MR900_GPIO_LED_LAN, + .active_low = 1, + }, + { + .name = "mr900:blue:wlan24", + .gpio = MR900_GPIO_LED_WLAN_2G, + .active_low = 1, + }, + { + .name = "mr900:blue:wlan58", + .gpio = MR900_GPIO_LED_WLAN_5G, + .active_low = 1, + }, + { + .name = "mr900:green:status", + .gpio = MR900_GPIO_LED_STATUS_GREEN, + .active_low = 1, + }, + { + .name = "mr900:red:status", + .gpio = MR900_GPIO_LED_STATUS_RED, + .active_low = 1, + }, +}; + +static struct gpio_keys_button mr900_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = MR900_KEYS_DEBOUNCE_INTERVAL, + .gpio = MR900_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + + +static void __init mr900_gmac_setup(void) +{ + void __iomem *base; + u32 t; + + base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE); + + t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG); + + t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII); + t |= QCA955X_ETH_CFG_RGMII_EN; + + __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG); + + iounmap(base); +} + +static void __init mr900_setup(void) +{ + u8 *art = (u8 *)KSEG1ADDR(0x1fff0000); + u8 mac[6], pcie_mac[6]; + struct ath9k_platform_data *pdata; + + ath79_eth0_pll_data.pll_1000 = 0xbe000101; + ath79_eth0_pll_data.pll_100 = 0x80000101; + ath79_eth0_pll_data.pll_10 = 0x80001313; + + ath79_register_m25p80(NULL); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(mr900_leds_gpio), + mr900_leds_gpio); + ath79_register_gpio_keys_polled(-1, MR900_KEYS_POLL_INTERVAL, + ARRAY_SIZE(mr900_gpio_keys), + mr900_gpio_keys); + + ath79_init_mac(mac, art + MR900_MAC0_OFFSET, 1); + ath79_register_wmac(art + MR900_WMAC_CALDATA_OFFSET, mac); + ath79_init_mac(pcie_mac, art + MR900_MAC0_OFFSET, 16); + ap91_pci_init(art + MR900_PCIE_CALDATA_OFFSET, pcie_mac); + pdata = ap9x_pci_get_wmac_data(0); + if (!pdata) { + pr_err("mr900: unable to get address of wlan data\n"); + return; + } + pdata->use_eeprom = true; + + mr900_gmac_setup(); + + ath79_register_mdio(0, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, art + MR900_MAC0_OFFSET, 0); + + /* GMAC0 is connected to the RMGII interface */ + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; + ath79_eth0_data.phy_mask = BIT(5); + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + + ath79_register_eth(0); +} + +MIPS_MACHINE(ATH79_MACH_MR900, "MR900", "OpenMesh MR900", mr900_setup); Added: trunk/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-mr900-support.patch =================================================================== --- trunk/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-mr900-support.patch (rev 0) +++ trunk/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-mr900-support.patch 2014-11-14 16:54:07 UTC (rev 43258) @@ -0,0 +1,39 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -654,6 +654,16 @@ config ATH79_MACH_CAP4200AG + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + ++config ATH79_MACH_MR900 ++ bool "OpenMesh MR900 board support" ++ select SOC_QCA955X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC ++ + config ATH79_MACH_EAP7660D + bool "Senao EAP7660D support" + select SOC_AR71XX +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -74,6 +74,7 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach + obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o + obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o + obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o ++obj-$(CONFIG_ATH79_MACH_MR900) += mach-mr900.o + obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o + obj-$(CONFIG_ATH79_MACH_MYNET_N750) += mach-mynet-n750.o + obj-$(CONFIG_ATH79_MACH_MYNET_REXT) += mach-mynet-rext.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -65,6 +65,7 @@ enum ath79_mach_type { + ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ + ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */ + ATH79_MACH_MR600, /* OpenMesh MR600 */ ++ ATH79_MACH_MR900, /* OpenMesh MR900 */ + ATH79_MACH_MYNET_N600, /* WD My Net N600 */ + ATH79_MACH_MYNET_N750, /* WD My Net N750 */ + ATH79_MACH_MYNET_REXT, /* WD My Net Wi-Fi Range Extender */ Added: trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch =================================================================== --- trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch (rev 0) +++ trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch 2014-11-14 16:54:07 UTC (rev 43258) @@ -0,0 +1,39 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -654,6 +654,16 @@ config ATH79_MACH_CAP4200AG + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + ++config ATH79_MACH_MR900 ++ bool "OpenMesh MR900 board support" ++ select SOC_QCA955X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC ++ + config ATH79_MACH_EAP7660D + bool "Senao EAP7660D support" + select SOC_AR71XX +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -74,6 +74,7 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach + obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o + obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o + obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o ++obj-$(CONFIG_ATH79_MACH_MR900) += mach-mr900.o + obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o + obj-$(CONFIG_ATH79_MACH_MYNET_N750) += mach-mynet-n750.o + obj-$(CONFIG_ATH79_MACH_MYNET_REXT) += mach-mynet-rext.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -65,6 +65,7 @@ enum ath79_mach_type { + ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ + ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */ + ATH79_MACH_MR600, /* OpenMesh MR600 */ ++ ATH79_MACH_MR900, /* OpenMesh MR900 */ + ATH79_MACH_MYNET_N600, /* WD My Net N600 */ + ATH79_MACH_MYNET_N750, /* WD My Net N750 */ + ATH79_MACH_MYNET_REXT, /* WD My Net Wi-Fi Range Extender */ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
