Changeset 15138

Timestamp:

09/09/10 17:34:43 (3 years ago)

Author:

BrainSlayer

Message:

fixup wmac assignment

Location:

src/linux/pb42/linux-2.6.34.6/arch/mips/pci

Files:

• fixup-ar7100.c (modified) (2 diffs)
• fixup-ar7240.c (modified) (1 diff)
• pci-ar7100.c (modified) (2 diffs)

src/linux/pb42/linux-2.6.34.6/arch/mips/pci/fixup-ar7100.c

@@ -1 +1 @@
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/ath9k_platform.h>
 #include "ar7100.h"
 
@@ -28 +29 @@
 #endif
 }
+static struct ath9k_platform_data ap94_wmac0_data;
+static struct ath9k_platform_data ap94_wmac1_data;
+
+#define CALDATA0_OFFSET         0x1000
+#define CALDATA1_OFFSET         0x5000
+ 
 
 int 
 pcibios_plat_dev_init(struct pci_dev *dev)
 {
+        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+        ap94_wmac0_data.slot = 0;
+        ap94_wmac1_data.slot = 1;
+
+        printk(KERN_EMERG "init ATH9k WMAC %d\n",PCI_SLOT(dev->devfn));
+        switch(PCI_SLOT(dev->devfn)) {
+        case 0:
+                memcpy(ap94_wmac0_data.eeprom_data, art + CALDATA0_OFFSET,sizeof(ap94_wmac0_data.eeprom_data));
+                dev->dev.platform_data = &ap94_wmac0_data;
+                break;
+
+        case 1:
+                memcpy(ap94_wmac1_data.eeprom_data, art + CALDATA1_OFFSET,sizeof(ap94_wmac1_data.eeprom_data));
+                dev->dev.platform_data = &ap94_wmac1_data;
+                break;
+        }
         return 0;
 }

src/linux/pb42/linux-2.6.34.6/arch/mips/pci/fixup-ar7240.c

@@ -29 +29 @@
 }
 
+static struct ath9k_platform_data ap91_wmac0_data;
+
+#define CALDATA0_OFFSET         0x1000
+
 int 
 pcibios_plat_dev_init(struct pci_dev *dev)
 {
+        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+        ap91_wmac0_data.slot = 0;
+
+        printk(KERN_EMERG "init ATH9k WMAC %d\n",PCI_SLOT(dev->devfn));
+        switch(PCI_SLOT(dev->devfn)) {
+        case 0:
+                memcpy(ap91_wmac0_data.eeprom_data, art + CALDATA0_OFFSET,sizeof(ap91_wmac0_data.eeprom_data));
+                dev->dev.platform_data = &ap91_wmac0_data;
+                break;
+        }
         return 0;
 }

src/linux/pb42/linux-2.6.34.6/arch/mips/pci/pci-ar7100.c

@@ -7 +7 @@
 #include <linux/cpumask.h>
 #include <linux/delay.h>
-#include <linux/ath9k_platform.h>
 
 #include <asm/delay.h>
@@ -176 +175 @@
  * There is no translation for inbound access (PCI device as a master)
  */
-static struct ath9k_platform_data ap94_wmac0_data;
-static struct ath9k_platform_data ap94_wmac1_data;
-
-#define CALDATA0_OFFSET         0x1000
-#define CALDATA1_OFFSET         0x5000
- 
 static void ar71xx_pci_fixup(struct pci_dev *dev)
 {
         u32 t;
-        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
         if (!ar71xx_pci_fixup_enable)
                 return;
                 
-        ap94_wmac0_data.slot = 0;
-        ap94_wmac1_data.slot = 1;
-        memcpy(ap94_wmac0_data.eeprom_data, art + CALDATA0_OFFSET,sizeof(ap94_wmac0_data.eeprom_data));
-
-        memcpy(ap94_wmac1_data.eeprom_data, art + CALDATA1_OFFSET,sizeof(ap94_wmac1_data.eeprom_data));
-
-        switch(PCI_SLOT(dev->devfn)) {
-        case 17:
-                dev->dev.platform_data = &ap94_wmac0_data;
-                break;
-
-        case 18:
-                dev->dev.platform_data = &ap94_wmac1_data;
-                break;
-        }
 
         if (dev->bus->number != 0 || dev->devfn != 0)