brcm63xx: update variant detection patches and fix VARID shift

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.10 / 416-BCM63XX-add-a-fixup-for-ath9k-devices.patch

diff --git a/target/linux/brcm63xx/patches-3.10/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/brcm63xx/patches-3.10/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
index 5977a43b589258affcc1829b872f4619269f5e89..af0642856521fb585509fbd7d48c90c9bccda22b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
+++ b/target/linux/brcm63xx/patches-3.10/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
@@ -88,7 +88,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 +              addr &= MPI_CSBASE_BASE_MASK;
 +      }
 +
-+      switch (bcm63xx_attached_flash) {
++      switch (bcm63xx_flash_get_type()) {
 +      case BCM63XX_FLASH_TYPE_PARALLEL:
 +              memcpy(eeprom, (void *)KSEG1ADDR(addr + offset), ATH9K_PLAT_EEP_MAX_WORDS * sizeof(u16));
 +              return eeprom;
@@ -144,7 +144,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 +
 +      switch (bcm63xx_get_cpu_id()) {
 +      case BCM6328_CPU_ID:
-+              val = BCM_PCIE_MEM_BASE_PA;
++              val = BCM_PCIE_MEM_BASE_PA_6328;
 +              break;
 +      case BCM6348_CPU_ID:
 +      case BCM6358_CPU_ID: