9a59b350b7
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46011
56 lines
2 KiB
Diff
56 lines
2 KiB
Diff
--- a/arch/mips/ath79/machtypes.h
|
|
+++ b/arch/mips/ath79/machtypes.h
|
|
@@ -171,6 +171,7 @@ enum ath79_mach_type {
|
|
ATH79_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
|
|
ATH79_MACH_UBNT_NANO_M_XW, /* Ubiquiti NanoStation M XW */
|
|
ATH79_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
|
|
+ ATH79_MACH_UBNT_ROCKET_M_XW, /* Ubiquiti Rocket M XW*/
|
|
ATH79_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
|
|
ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
|
|
ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
|
|
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
|
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
|
@@ -449,12 +449,43 @@ static void __init ubnt_loco_m_xw_setup(
|
|
ath79_register_eth(0);
|
|
}
|
|
|
|
+static void __init ubnt_rocket_m_xw_setup(void)
|
|
+{
|
|
+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
|
|
+
|
|
+ ath79_register_m25p80(NULL);
|
|
+
|
|
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xw_leds_gpio),
|
|
+ ubnt_xw_leds_gpio);
|
|
+ ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
|
|
+ ARRAY_SIZE(ubnt_xm_gpio_keys),
|
|
+ ubnt_xm_gpio_keys);
|
|
+
|
|
+ ath79_register_wmac(eeprom + UAP_PRO_WMAC_CALDATA_OFFSET, NULL);
|
|
+ ap91_pci_init(eeprom + UAP_PRO_PCI_CALDATA_OFFSET, NULL);
|
|
+
|
|
+ ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
|
|
+ ath79_init_mac(ath79_eth0_data.mac_addr,
|
|
+ eeprom + UAP_PRO_MAC0_OFFSET, 0);
|
|
+
|
|
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
|
+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
|
|
+
|
|
+ ath79_register_mdio(0, ~BIT(4));
|
|
+ ath79_eth0_data.phy_mask = BIT(4);
|
|
+ ath79_eth0_pll_data.pll_1000 = 0x06000000;
|
|
+ ath79_register_eth(0);
|
|
+}
|
|
+
|
|
MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, "UBNT-NM-XW", "Ubiquiti Nanostation M XW",
|
|
ubnt_nano_m_xw_setup);
|
|
|
|
MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
|
|
ubnt_loco_m_xw_setup);
|
|
|
|
+MIPS_MACHINE(ATH79_MACH_UBNT_ROCKET_M_XW, "UBNT-RM-XW", "Ubiquiti Rocket M XW",
|
|
+ ubnt_rocket_m_xw_setup);
|
|
+
|
|
static struct gpio_led ubnt_airgateway_gpio_leds[] __initdata = {
|
|
{
|
|
.name = "ubnt:blue:wlan",
|