ar71xx: cosmetic fix of alfa ap120c/ap96 ordering

Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49087 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 7cfd319..5768286 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -330,12 +330,12 @@ ar71xx_board_detect() {
        *"AirRouter")
                name="airrouter"
                ;;
-       *"ALFA Network AP96")
-               name="alfa-ap96"
-               ;;
        *"ALFA Network AP120C")
                name="alfa-ap120c"
                ;;
+       *"ALFA Network AP96")
+               name="alfa-ap96"
+               ;;
        *"ALFA Network N2/N5")
                name="alfa-nx"
                ;;

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 f71275c..524f93d 100644 (file)
--- 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/image/Makefile b/target/linux/ar71xx/image/Makefile
index d00b9be..1a399ab 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -972,8 +972,8 @@ define Build/Clean
 endef
 
 
-alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware)
 alfa_ap120c_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,13312k(rootfs),1536k(kernel),1152k(unknown)ro,64k(art)ro;spi0.1:-(unknown)
+alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware)
 alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
 alfa_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro
 all0258n_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),6272k(firmware),1536k(failsafe),64k(art)

diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
index 18f8de9..d6e786d 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
@@ -4,8 +4,8 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
-+      ATH79_MACH_ALFA_AP96,           /* ALFA Network AP96 board */
 +      ATH79_MACH_ALFA_AP120C,         /* ALFA Network AP120C board */
++      ATH79_MACH_ALFA_AP96,           /* ALFA Network AP96 board */
 +      ATH79_MACH_ALFA_NX,             /* ALFA Network N2/N5 board */
 +      ATH79_MACH_ALL0258N,            /* Allnet ALL0258N */
 +      ATH79_MACH_ALL0305,             /* Allnet ALL0305 */
@@ -206,22 +206,22 @@
  
  menu "Atheros AR71XX/AR724X/AR913X machine selection"
  
-+config ATH79_MACH_ALFA_AP96
-+      bool "ALFA Network AP96 board support"
++config ATH79_MACH_ALFA_AP120C
++      bool "ALFA Network AP120C board support"
 +      select SOC_AR71XX
++      select ATH79_DEV_AP9X_PCI if PCI
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_M25P80
-+      select ATH79_DEV_USB
++      select ATH79_DEV_WMAC
 +
-+config ATH79_MACH_ALFA_AP120C
-+      bool "ALFA Network AP120C board support"
++config ATH79_MACH_ALFA_AP96
++      bool "ALFA Network AP96 board support"
 +      select SOC_AR71XX
-+      select ATH79_DEV_AP9X_PCI if PCI
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_M25P80
-+      select ATH79_DEV_WMAC
++      select ATH79_DEV_USB
 +
 +config ATH79_MACH_HORNET_UB
 +      bool "ALFA Network Hornet-UB board support"
@@ -1498,8 +1498,8 @@
  #
  # 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