diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-03-24 21:09:34 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-03-24 21:09:34 +0000 |
| commit | 8258f8edb60e0ee7f1518bf44696d9a6b846d524 (patch) | |
| tree | 4e154caab8e0ceccc303efcf41c8a32cc320916a /target/linux/ar71xx/files | |
| parent | 35e7bfb90652004ca7b4ab13e439b30330666426 (diff) | |
| download | upstream-8258f8edb60e0ee7f1518bf44696d9a6b846d524.tar.gz upstream-8258f8edb60e0ee7f1518bf44696d9a6b846d524.tar.bz2 upstream-8258f8edb60e0ee7f1518bf44696d9a6b846d524.zip | |
ar71xx: cosmetic fix of alfa ap120c/ap96 ordering
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 49086
Diffstat (limited to 'target/linux/ar71xx/files')
4 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 4c70c0ab14..f47f1b97dc 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1,11 +1,3 @@ -config ATH79_MACH_ALFA_AP96 - bool "ALFA Network AP96 board support" - select SOC_AR71XX - select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_M25P80 - select ATH79_DEV_USB - config ATH79_MACH_ALFA_AP120C bool "ALFA Network AP120C board support" select ATH79_DEV_AP9X_PCI if PCI @@ -14,6 +6,14 @@ config ATH79_MACH_ALFA_AP120C select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_ALFA_AP96 + bool "ALFA Network AP96 board support" + select SOC_AR71XX + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + config ATH79_MACH_HORNET_UB bool "ALFA Network Hornet-UB board support" select SOC_AR933X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 0c024c8a08..74376b2294 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -38,8 +38,8 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += routerboot.o # # Machines # -obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o obj-$(CONFIG_ATH79_MACH_ALFA_AP120C) += mach-alfa-ap120c.o +obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o obj-$(CONFIG_ATH79_MACH_ALL0315N) += mach-all0315n.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c index f71275c035..524f93d264 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c @@ -101,13 +101,13 @@ static void __init alfa_ap120c_init(void) struct ath9k_platform_data *pdata; ath79_register_leds_gpio(-1, ARRAY_SIZE(alfa_ap120c_leds_gpio), - alfa_ap120c_leds_gpio); + alfa_ap120c_leds_gpio); ath79_register_gpio_keys_polled(-1, ALFA_AP120C_KEYS_POLL_INTERVAL, ARRAY_SIZE(alfa_ap120c_gpio_keys), alfa_ap120c_gpio_keys); ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN | - AR71XX_GPIO_FUNC_SPI_CS2_EN); + AR71XX_GPIO_FUNC_SPI_CS2_EN); ath79_register_m25p80_multi(&flash); @@ -124,7 +124,7 @@ static void __init alfa_ap120c_init(void) pdata->use_eeprom = true; ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | - BIT(15) | BIT(17) | BIT(19) | BIT(21)); + BIT(15) | BIT(17) | BIT(19) | BIT(21)); ath79_register_mdio(0, 0x0); @@ -144,4 +144,4 @@ static void __init alfa_ap120c_init(void) } MIPS_MACHINE(ATH79_MACH_ALFA_AP120C, "ALFA-AP120C", "ALFA Network AP120C", - alfa_ap120c_init); + alfa_ap120c_init); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 43e2897231..307d2dff71 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -17,8 +17,8 @@ enum ath79_mach_type { ATH79_MACH_GENERIC_OF = -1, /* Device tree board */ ATH79_MACH_GENERIC = 0, + ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120C board */ ATH79_MACH_ALFA_AP96, /* ALFA Network AP96 board */ - ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120 board */ ATH79_MACH_ALFA_NX, /* ALFA Network N2/N5 board */ ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ ATH79_MACH_ALL0305, /* Allnet ALL0305 */ |