From 00ab2668aa83ab894b73674e27b6c31499b3a773 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 17 Jul 2012 21:27:55 -0400 Subject: [PATCH 123/123] ath79: fixup for not carrying Ubiquiti LSX/LSS Delete LSX/LSS code where required, We've dropped the LSX/LSS support from the openwrt set, since we only want routerstation pro support here. Signed-off-by: Paul Gortmaker --- arch/mips/ath79/mach-ubnt.c | 60 ------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/arch/mips/ath79/mach-ubnt.c b/arch/mips/ath79/mach-ubnt.c index e49ac23..5321239 100644 --- a/arch/mips/ath79/mach-ubnt.c +++ b/arch/mips/ath79/mach-ubnt.c @@ -42,38 +42,6 @@ static struct gpio_led ubnt_rs_leds_gpio[] __initdata = { } }; -static struct gpio_led ubnt_ls_sr71_leds_gpio[] __initdata = { - { - .name = "ubnt:green:d22", - .gpio = UBNT_LS_SR71_GPIO_LED_D22, - .active_low = 0, - }, { - .name = "ubnt:green:d23", - .gpio = UBNT_LS_SR71_GPIO_LED_D23, - .active_low = 0, - }, { - .name = "ubnt:green:d24", - .gpio = UBNT_LS_SR71_GPIO_LED_D24, - .active_low = 0, - }, { - .name = "ubnt:red:d25", - .gpio = UBNT_LS_SR71_GPIO_LED_D25, - .active_low = 0, - }, { - .name = "ubnt:red:d26", - .gpio = UBNT_LS_SR71_GPIO_LED_D26, - .active_low = 0, - }, { - .name = "ubnt:green:d27", - .gpio = UBNT_LS_SR71_GPIO_LED_D27, - .active_low = 0, - }, { - .name = "ubnt:green:d28", - .gpio = UBNT_LS_SR71_GPIO_LED_D28, - .active_low = 0, - } -}; - static struct gpio_keys_button ubnt_gpio_keys[] __initdata = { { .desc = "sw4", @@ -175,31 +143,3 @@ static void __init ubnt_rspro_setup(void) MIPS_MACHINE(ATH79_MACH_UBNT_RSPRO, "UBNT-RSPRO", "Ubiquiti RouterStation Pro", ubnt_rspro_setup); - -static void __init ubnt_lsx_setup(void) -{ - ubnt_generic_setup(); -} - -MIPS_MACHINE(ATH79_MACH_UBNT_LSX, "UBNT-LSX", "Ubiquiti LSX", ubnt_lsx_setup); - -#define UBNT_LSSR71_PHY_MASK BIT(1) - -static void __init ubnt_lssr71_setup(void) -{ - ubnt_generic_setup(); - - ath79_register_mdio(0, ~UBNT_LSSR71_PHY_MASK); - - ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0); - ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; - ath79_eth0_data.phy_mask = UBNT_LSSR71_PHY_MASK; - - ath79_register_eth(0); - - ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_ls_sr71_leds_gpio), - ubnt_ls_sr71_leds_gpio); -} - -MIPS_MACHINE(ATH79_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71", - ubnt_lssr71_setup); -- 1.7.9.7