Changeset 26595


Ignore:
Timestamp:
2011-04-11T19:37:08+02:00 (7 years ago)
Author:
juhosg
Message:

ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac

Location:
trunk/target/linux/ar71xx
Files:
2 added
4 deleted
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/config-2.6.37

    r26558 r26595  
    55CONFIG_AR71XX_DEV_AP91_PCI=y 
    66CONFIG_AR71XX_DEV_AP94_PCI=y 
    7 CONFIG_AR71XX_DEV_AR913X_WMAC=y 
    8 CONFIG_AR71XX_DEV_AR934X_WMAC=y 
     7CONFIG_AR71XX_DEV_AR9XXX_WMAC=y 
    98CONFIG_AR71XX_DEV_DB120_PCI=y 
    109CONFIG_AR71XX_DEV_DSA=y 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig

    r26523 r26595  
    66        bool "Atheros AP81 board support" 
    77        select AR71XX_DEV_M25P80 
    8         select AR71XX_DEV_AR913X_WMAC 
     8        select AR71XX_DEV_AR9XXX_WMAC 
    99        select AR71XX_DEV_GPIO_BUTTONS 
    1010        select AR71XX_DEV_LEDS_GPIO 
     
    1414config AR71XX_MACH_AP83 
    1515        bool "Atheros AP83 board support" 
    16         select AR71XX_DEV_AR913X_WMAC 
     16        select AR71XX_DEV_AR9XXX_WMAC 
    1717        select AR71XX_DEV_GPIO_BUTTONS 
    1818        select AR71XX_DEV_LEDS_GPIO 
     
    3131config AR71XX_MACH_DB120 
    3232        bool "Atheros DB120 board support" 
    33         select AR71XX_DEV_AR934X_WMAC 
     33        select AR71XX_DEV_AR9XXX_WMAC 
    3434        select AR71XX_DEV_DB120_PCI if PCI 
    3535        select AR71XX_DEV_GPIO_BUTTONS 
     
    5050        bool "D-Link DIR-615 rev. C1 support" 
    5151        select AR71XX_DEV_M25P80 
    52         select AR71XX_DEV_AR913X_WMAC 
     52        select AR71XX_DEV_AR9XXX_WMAC 
    5353        select AR71XX_DEV_GPIO_BUTTONS 
    5454        select AR71XX_DEV_LEDS_GPIO 
     
    115115config AR71XX_MACH_WZR_HP_G300NH 
    116116        bool "Buffalo WZR-HP-G300NH board support" 
    117         select AR71XX_DEV_AR913X_WMAC 
     117        select AR71XX_DEV_AR9XXX_WMAC 
    118118        select AR71XX_DEV_GPIO_BUTTONS 
    119119        select AR71XX_DEV_LEDS_GPIO 
     
    134134        bool "Linksys WRT160NL board support" 
    135135        select AR71XX_DEV_M25P80 
    136         select AR71XX_DEV_AR913X_WMAC 
     136        select AR71XX_DEV_AR9XXX_WMAC 
    137137        select AR71XX_DEV_GPIO_BUTTONS 
    138138        select AR71XX_DEV_LEDS_GPIO 
     
    172172        bool "NETGEAR WNR2000 board support" 
    173173        select AR71XX_DEV_M25P80 
    174         select AR71XX_DEV_AR913X_WMAC 
     174        select AR71XX_DEV_AR9XXX_WMAC 
    175175        select AR71XX_DEV_GPIO_BUTTONS 
    176176        select AR71XX_DEV_LEDS_GPIO 
     
    180180        bool "Planex MZK-W04NU board support" 
    181181        select AR71XX_DEV_M25P80 
    182         select AR71XX_DEV_AR913X_WMAC 
     182        select AR71XX_DEV_AR9XXX_WMAC 
    183183        select AR71XX_DEV_GPIO_BUTTONS 
    184184        select AR71XX_DEV_LEDS_GPIO 
     
    189189        bool "Planex MZK-W300NH board support" 
    190190        select AR71XX_DEV_M25P80 
    191         select AR71XX_DEV_AR913X_WMAC 
     191        select AR71XX_DEV_AR9XXX_WMAC 
    192192        select AR71XX_DEV_GPIO_BUTTONS 
    193193        select AR71XX_DEV_LEDS_GPIO 
     
    197197        bool "Zyxel NBG460N/550N/550NH board support" 
    198198        select AR71XX_DEV_M25P80 
    199         select AR71XX_DEV_AR913X_WMAC 
     199        select AR71XX_DEV_AR9XXX_WMAC 
    200200        select AR71XX_DEV_GPIO_BUTTONS 
    201201        select AR71XX_DEV_LEDS_GPIO 
     
    222222        bool "TP-LINK TL-WA901ND v2 support" 
    223223        select AR71XX_DEV_M25P80 
    224         select AR71XX_DEV_AR913X_WMAC 
     224        select AR71XX_DEV_AR9XXX_WMAC 
    225225        select AR71XX_DEV_GPIO_BUTTONS 
    226226        select AR71XX_DEV_LEDS_GPIO 
     
    247247        bool "TP-LINK TL-WR941ND support" 
    248248        select AR71XX_DEV_M25P80 
    249         select AR71XX_DEV_AR913X_WMAC 
     249        select AR71XX_DEV_AR9XXX_WMAC 
    250250        select AR71XX_DEV_DSA 
    251251        select AR71XX_DEV_GPIO_BUTTONS 
     
    256256        bool "TP-LINK TL-WR1043ND support" 
    257257        select AR71XX_DEV_M25P80 
    258         select AR71XX_DEV_AR913X_WMAC 
     258        select AR71XX_DEV_AR9XXX_WMAC 
    259259        select AR71XX_DEV_GPIO_BUTTONS 
    260260        select AR71XX_DEV_LEDS_GPIO 
     
    265265        bool "TRENDnet TEW-632BRP support" 
    266266        select AR71XX_DEV_M25P80 
    267         select AR71XX_DEV_AR913X_WMAC 
     267        select AR71XX_DEV_AR9XXX_WMAC 
    268268        select AR71XX_DEV_GPIO_BUTTONS 
    269269        select AR71XX_DEV_LEDS_GPIO 
     
    309309        def_bool n 
    310310 
    311 config AR71XX_DEV_AR913X_WMAC 
    312         def_bool n 
    313  
    314 config AR71XX_DEV_AR934X_WMAC 
     311config AR71XX_DEV_AR9XXX_WMAC 
    315312        def_bool n 
    316313 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile

    r26523 r26595  
    1616obj-$(CONFIG_AR71XX_DEV_AP91_PCI)       += dev-ap91-pci.o 
    1717obj-$(CONFIG_AR71XX_DEV_AP94_PCI)       += dev-ap94-pci.o 
    18 obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC)    += dev-ar913x-wmac.o 
    19 obj-$(CONFIG_AR71XX_DEV_AR934X_WMAC)    += dev-ar934x-wmac.o 
     18obj-$(CONFIG_AR71XX_DEV_AR9XXX_WMAC)    += dev-ar9xxx-wmac.o 
    2019obj-$(CONFIG_AR71XX_DEV_DB120_PCI)      += dev-db120-pci.o 
    2120obj-$(CONFIG_AR71XX_DEV_DSA)            += dev-dsa.o 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c

    r23975 r26595  
    1818#include "devices.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    136136                                        ap81_gpio_buttons); 
    137137 
    138         ar913x_add_device_wmac(eeprom, NULL); 
     138        ar9xxx_add_device_wmac(eeprom, NULL); 
    139139} 
    140140 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c

    r23975 r26595  
    2323#include "machtype.h" 
    2424#include "devices.h" 
    25 #include "dev-ar913x-wmac.h" 
     25#include "dev-ar9xxx-wmac.h" 
    2626#include "dev-gpio-buttons.h" 
    2727#include "dev-leds-gpio.h" 
     
    223223        ar71xx_add_device_usb(); 
    224224 
    225         ar913x_add_device_wmac(eeprom, NULL); 
     225        ar9xxx_add_device_wmac(eeprom, NULL); 
    226226 
    227227        platform_device_register(&ap83_flash_device); 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c

    r26557 r26595  
    2020#include "dev-leds-gpio.h" 
    2121#include "dev-usb.h" 
    22 #include "dev-ar934x-wmac.h" 
     22#include "dev-ar9xxx-wmac.h" 
    2323#include "dev-db120-pci.h" 
    2424 
     
    125125                                        db120_gpio_buttons); 
    126126 
    127         ar934x_add_device_wmac(art + DB120_CALDATA_OFFSET, 
     127        ar9xxx_add_device_wmac(art + DB120_CALDATA_OFFSET, 
    128128                                art + DB120_WMAC_MAC_OFFSET); 
    129129 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c

    r23975 r26595  
    1818#include "devices.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    168168                                        dir_615c1_gpio_buttons); 
    169169 
    170         ar913x_add_device_wmac(eeprom, wlan_mac); 
     170        ar9xxx_add_device_wmac(eeprom, wlan_mac); 
    171171} 
    172172 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c

    r23975 r26595  
    1616#include "machtype.h" 
    1717#include "devices.h" 
    18 #include "dev-ar913x-wmac.h" 
     18#include "dev-ar9xxx-wmac.h" 
    1919#include "dev-gpio-buttons.h" 
    2020#include "dev-leds-gpio.h" 
     
    159159        ar71xx_add_device_usb(); 
    160160 
    161         ar913x_add_device_wmac(eeprom, NULL); 
     161        ar9xxx_add_device_wmac(eeprom, NULL); 
    162162} 
    163163 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c

    r23975 r26595  
    1818#include "devices.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    152152                                        ARRAY_SIZE(mzk_w300nh_gpio_buttons), 
    153153                                        mzk_w300nh_gpio_buttons); 
    154         ar913x_add_device_wmac(eeprom, NULL); 
     154        ar9xxx_add_device_wmac(eeprom, NULL); 
    155155} 
    156156 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c

    r23977 r26595  
    2626#include "devices.h" 
    2727#include "dev-m25p80.h" 
    28 #include "dev-ar913x-wmac.h" 
     28#include "dev-ar9xxx-wmac.h" 
    2929#include "dev-gpio-buttons.h" 
    3030#include "dev-leds-gpio.h" 
     
    207207        ar71xx_add_device_m25p80(&nbg460n_flash_data); 
    208208 
    209         ar913x_add_device_wmac(eeprom, mac); 
     209        ar9xxx_add_device_wmac(eeprom, mac); 
    210210 
    211211        /* register RTC chip */ 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c

    r23975 r26595  
    1818#include "devices.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    144144                                        tew_632brp_gpio_buttons); 
    145145 
    146         ar913x_add_device_wmac(eeprom, wlan_mac); 
     146        ar9xxx_add_device_wmac(eeprom, wlan_mac); 
    147147} 
    148148 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c

    r26119 r26595  
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
    23 #include "dev-ar913x-wmac.h" 
     23#include "dev-ar9xxx-wmac.h" 
    2424 
    2525#define TL_WA901ND_V2_GPIO_LED_QSS              4 
     
    125125                                        tl_wa901nd_v2_gpio_buttons); 
    126126 
    127         ar913x_add_device_wmac(eeprom, mac); 
     127        ar9xxx_add_device_wmac(eeprom, mac); 
    128128} 
    129129 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c

    r23975 r26595  
    1818#include "devices.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    149149                                        tl_wr1043nd_gpio_buttons); 
    150150 
    151         ar913x_add_device_wmac(eeprom, mac); 
     151        ar9xxx_add_device_wmac(eeprom, mac); 
    152152} 
    153153 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c

    r24612 r26595  
    1818#include "dev-dsa.h" 
    1919#include "dev-m25p80.h" 
    20 #include "dev-ar913x-wmac.h" 
     20#include "dev-ar9xxx-wmac.h" 
    2121#include "dev-gpio-buttons.h" 
    2222#include "dev-leds-gpio.h" 
     
    140140                                        ARRAY_SIZE(tl_wr941nd_gpio_buttons), 
    141141                                        tl_wr941nd_gpio_buttons); 
    142         ar913x_add_device_wmac(eeprom, mac); 
     142        ar9xxx_add_device_wmac(eeprom, mac); 
    143143} 
    144144 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c

    r23975 r26595  
    1919#include "devices.h" 
    2020#include "dev-m25p80.h" 
    21 #include "dev-ar913x-wmac.h" 
     21#include "dev-ar9xxx-wmac.h" 
    2222#include "dev-gpio-buttons.h" 
    2323#include "dev-leds-gpio.h" 
     
    144144 
    145145 
    146         ar913x_add_device_wmac(eeprom, NULL); 
     146        ar9xxx_add_device_wmac(eeprom, NULL); 
    147147} 
    148148 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c

    r23975 r26595  
    1717#include "devices.h" 
    1818#include "dev-m25p80.h" 
    19 #include "dev-ar913x-wmac.h" 
     19#include "dev-ar9xxx-wmac.h" 
    2020#include "dev-gpio-buttons.h" 
    2121#include "dev-leds-gpio.h" 
     
    144144        if (nvram_parse_mac_addr(nvram, WRT160NL_NVRAM_SIZE, 
    145145                                 "wl0_hwaddr=", mac) == 0) 
    146                 ar913x_add_device_wmac(eeprom, mac); 
     146                ar9xxx_add_device_wmac(eeprom, mac); 
    147147        else 
    148                 ar913x_add_device_wmac(eeprom, NULL); 
     148                ar9xxx_add_device_wmac(eeprom, NULL); 
    149149 
    150150        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wrt160nl_leds_gpio), 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c

    r23975 r26595  
    2121#include "machtype.h" 
    2222#include "devices.h" 
    23 #include "dev-ar913x-wmac.h" 
     23#include "dev-ar9xxx-wmac.h" 
    2424#include "dev-gpio-buttons.h" 
    2525#include "dev-leds-gpio.h" 
     
    248248 
    249249        ar71xx_add_device_usb(); 
    250         ar913x_add_device_wmac(eeprom, NULL); 
     250        ar9xxx_add_device_wmac(eeprom, NULL); 
    251251 
    252252        platform_device_register(&wzrhpg300nh_74hc153_device); 
Note: See TracChangeset for help on using the changeset viewer.