Changeset 18234

Timestamp:

01/20/12 12:15:24 (16 months ago)

Author:

BrainSlayer

Message:

fix some pb42 configs for epoll support and change lantiq wifi eeprom api

Location:

src/linux/universal/linux-3.2

Files:

• .config_ar7240_nousb (modified) (1 diff)
• .config_dir615e (modified) (1 diff)
• .config_wlae (modified) (1 diff)
• .config_wp543 (modified) (1 diff)
• .config_wr741 (modified) (1 diff)
• arch/mips/lantiq/xway/devices.c (modified) (1 diff)
• arch/mips/lantiq/xway/devices.h (modified) (1 diff)
• arch/mips/lantiq/xway/mach-arv45xx.c (modified) (3 diffs)
• arch/mips/lantiq/xway/mach-gigasx76x.c (modified) (2 diffs)

src/linux/universal/linux-3.2/.config_ar7240_nousb

@@ -212 +212 @@
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 # CONFIG_SIGNALFD is not set
 CONFIG_TIMERFD=y

src/linux/universal/linux-3.2/.config_dir615e

@@ -211 +211 @@
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set

src/linux/universal/linux-3.2/.config_wlae

@@ -212 +212 @@
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 # CONFIG_SIGNALFD is not set
 CONFIG_TIMERFD=y

src/linux/universal/linux-3.2/.config_wp543

@@ -210 +210 @@
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set

src/linux/universal/linux-3.2/.config_wr741

@@ -211 +211 @@
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set

src/linux/universal/linux-3.2/arch/mips/lantiq/xway/devices.c

@@ -106 +106 @@
 EXPORT_SYMBOL(lantiq_emulate_madwifi_eep);
 
-int lantiq_madwifi_eep_addr = 0;
+void *lantiq_madwifi_eep_addr = NULL;
 EXPORT_SYMBOL(lantiq_madwifi_eep_addr);
 
 void __init
-ltq_register_madwifi_eep(unsigned long long addr)
+ltq_register_madwifi_eep(void *addr)
 {
         lantiq_madwifi_eep_addr = addr;

src/linux/universal/linux-3.2/arch/mips/lantiq/xway/devices.h

@@ -22 +22 @@
 extern void ltq_register_spi(struct ltq_spi_platform_data *pdata,
         struct spi_board_info const *info, unsigned n);
-extern void ltq_register_madwifi_eep(unsigned long long addr);
+extern void ltq_register_madwifi_eep(void *addr);
 extern void ltq_register_gpio_buttons(struct gpio_button *buttons, int cnt);
 

src/linux/universal/linux-3.2/arch/mips/lantiq/xway/mach-arv45xx.c

@@ -446 +446 @@
         ltq_pci_data.gpio = PCI_GNT2 | PCI_REQ2;
         ltq_register_pci(&ltq_pci_data);
-        ltq_register_madwifi_eep(ARV4518PW_MADWIFI_ADDR);
+        ltq_register_madwifi_eep((void*)ARV4518PW_MADWIFI_ADDR);
         ltq_register_ath5k(arv45xx_ath5k_eeprom_data, arv45xx_ath5k_eeprom_mac);
         xway_register_dwc(ARV4518PW_USB);
@@ -499 +499 @@
         ltq_register_nor(&arv45xx_flash_data);
         ltq_register_pci(&ltq_pci_data);
-        ltq_register_madwifi_eep(ARV452CPW_MADWIFI_ADDR);
+        ltq_register_madwifi_eep((void*)ARV452CPW_MADWIFI_ADDR);
         xway_register_dwc(ARV452CPW_USB);
         arv45xx_register_ethernet();
@@ -531 +531 @@
         ltq_pci_data.clock = PCI_CLOCK_INT;
         ltq_register_pci(&ltq_pci_data);
-        ltq_register_madwifi_eep(ARV4525PW_MADWIFI_ADDR);
+        ltq_register_madwifi_eep((void*)ARV4525PW_MADWIFI_ADDR);
         ltq_eth_data.mii_mode = PHY_INTERFACE_MODE_MII;
         arv45xx_register_ethernet();

src/linux/universal/linux-3.2/arch/mips/lantiq/xway/mach-gigasx76x.c

@@ -220 +220 @@
 #define GIGASX76X_USB           29
 #define GIGASX76X_MADWIFI_ADDR  0xb07f0000
-        unsigned int offset;
         ltq_register_gpio_stp();
         ltq_register_nor(&gigasx76x_flash_data);
@@ -228 +227 @@
         ltq_register_gpio_keys_polled(-1, LTQ_KEYS_POLL_INTERVAL, ARRAY_SIZE(gigasx76x_gpio_keys), gigasx76x_gpio_keys);
         ltq_register_ath5k(gigasx76x_ath5k_eeprom_data, gigasx76x_ath5k_eeprom_mac);
-        offset = (unsigned int)&gigasx76x_ath5k_eeprom_data;
-        ltq_register_madwifi_eep((unsigned long long)offset);
+        ltq_register_madwifi_eep(gigasx76x_ath5k_eeprom_data);
 
         xway_register_dwc(GIGASX76X_USB);