brcm63xx: update HSSPI driver with upstream submission

[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 8e2feb8bf69198fe93dc8b5fa3687b1cc247cc73..5977a43b589258affcc1829b872f4619269f5e89 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
@@ -15,7 +15,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 +++ b/arch/mips/bcm63xx/Makefile
 @@ -2,7 +2,7 @@ obj-y          += clk.o cpu.o cs.o gpio.o irq.o
                   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
-                  dev-hsspi.o dev-pcmcia.o dev-rng.o dev-spi.o dev-uart.o \
+                  dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
                   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
 -                 usb-common.o
 +                 pci-ath9k-fixup.o usb-common.o
@@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
  obj-y         += boards/
 --- /dev/null
 +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
-@@ -0,0 +1,190 @@
+@@ -0,0 +1,192 @@
 +/*
 + *  Broadcom BCM63XX Ath9k EEPROM fixup helper.
 + *
@@ -53,6 +53,8 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 +#include <bcm63xx_dev_hsspi.h>
 +#include <pci_ath9k_fixup.h>
 +
++#define bcm_hsspi_writel(v, o)        bcm_rset_writel(RSET_HSSPI, (v), (o))
++
 +struct ath9k_fixup {
 +      unsigned slot;
 +      u8 mac[ETH_ALEN];