atheros: fix up empty radio data mac address (based on patch from #8601)

[openwrt.git] / target / linux / atheros / patches-2.6.37 / 100-board.patch

diff --git a/target/linux/atheros/patches-2.6.37/100-board.patch b/target/linux/atheros/patches-2.6.37/100-board.patch
index 1cf355f..b72d321 100644 (file)
--- a/target/linux/atheros/patches-2.6.37/100-board.patch
+++ b/target/linux/atheros/patches-2.6.37/100-board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -100,6 +100,19 @@ config BCM63XX
+@@ -102,6 +102,19 @@ config BCM63XX
        help
         Support for BCM63XX based boards
  
@@ -20,7 +20,7 @@
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K
-@@ -714,6 +727,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -716,6 +729,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
  
  endchoice
  
@@ -85,7 +85,7 @@
 +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- /dev/null
 +++ b/arch/mips/ar231x/board.c
-@@ -0,0 +1,251 @@
+@@ -0,0 +1,258 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -225,6 +225,7 @@
 +      u8 *bcfg, *rcfg;
 +      u8 *board_data;
 +      u8 *radio_data;
++      u8 *mac_addr;
 +      u32 offset;
 +
 +      ar231x_board.config = NULL;
@@ -282,6 +283,12 @@
 +      rcfg_size = BOARD_CONFIG_BUFSZ - offset;
 +      memcpy(radio_data, rcfg, rcfg_size);
 +
++      mac_addr = &radio_data[0x1d * 2];
++      if (is_broadcast_ether_addr(mac_addr)) {
++              printk(KERN_INFO "Radio MAC is blank; using board-data\n");
++              memcpy(mac_addr, ar231x_board.config->wlan0_mac, ETH_ALEN);
++      }
++
 +      return 0;
 +}
 +
@@ -552,7 +559,7 @@
 +#endif /* __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H */
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-ar231x/dma-coherence.h
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,76 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -567,22 +574,34 @@
 +
 +#define PCI_DMA_OFFSET        0x20000000
 +
-+struct device;
++#include <linux/device.h>
++
++static inline dma_addr_t ar231x_dev_offset(struct device *dev)
++{
++#ifdef CONFIG_PCI
++      extern struct bus_type pci_bus_type;
++
++      if (dev && dev->bus == &pci_bus_type)
++              return PCI_DMA_OFFSET;
++      else
++#endif
++              return 0;
++}
 +
 +static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)
 +{
-+      return virt_to_phys(addr) + (dev != NULL ? PCI_DMA_OFFSET : 0);
++      return virt_to_phys(addr) + ar231x_dev_offset(dev);
 +}
 +
 +static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
 +{
-+      return page_to_phys(page) + (dev != NULL ? PCI_DMA_OFFSET : 0);
++      return page_to_phys(page) + ar231x_dev_offset(dev);
 +}
 +
 +static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
 +      dma_addr_t dma_addr)
 +{
-+      return (dma_addr > PCI_DMA_OFFSET ? dma_addr - PCI_DMA_OFFSET : dma_addr);
++      return dma_addr - ar231x_dev_offset(dev);
 +}
 +
 +static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
@@ -619,7 +638,7 @@
 +#endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-ar231x/gpio.h
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,84 @@
 +#ifndef _ATHEROS_GPIO_H_
 +#define _ATHEROS_GPIO_H_
 +
@@ -696,6 +715,11 @@
 +      return (irq - (AR531X_GPIO_IRQ(0)));
 +}
 +
++static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
++{
++      return -ENOSYS;
++}
++
 +#include <asm-generic/gpio.h> /* cansleep wrappers */
 +
 +#endif
@@ -768,14 +792,14 @@
 + * Address map
 + */
 +#define AR2315_SPI_READ         0x08000000      /* SPI FLASH */
-+#define AR2315_WLAN0            0xB0000000      /* Wireless MMR */
-+#define AR2315_PCI              0xB0100000      /* PCI MMR */
-+#define AR2315_SDRAMCTL         0xB0300000      /* SDRAM MMR */
-+#define AR2315_LOCAL            0xB0400000      /* LOCAL BUS MMR */
-+#define AR2315_ENET0            0xB0500000      /* ETHERNET MMR */
-+#define AR2315_DSLBASE          0xB1000000      /* RESET CONTROL MMR */
-+#define AR2315_UART0            0xB1100003      /* UART MMR */
-+#define AR2315_SPI              0xB1300000      /* SPI FLASH MMR */
++#define AR2315_WLAN0            0x10000000      /* Wireless MMR */
++#define AR2315_PCI              0x10100000      /* PCI MMR */
++#define AR2315_SDRAMCTL         0x10300000      /* SDRAM MMR */
++#define AR2315_LOCAL            0x10400000      /* LOCAL BUS MMR */
++#define AR2315_ENET0            0x10500000      /* ETHERNET MMR */
++#define AR2315_DSLBASE          0x11000000      /* RESET CONTROL MMR */
++#define AR2315_UART0            0x11100003      /* UART MMR */
++#define AR2315_SPI              0x11300000      /* SPI FLASH MMR */
 +#define AR2315_PCIEXT           0x80000000      /* pci external */
 +
 +/*
@@ -2457,7 +2481,7 @@
 +      .reset_base = AR2315_RESET,
 +      .reset_mac = AR2315_RESET_ENET0,
 +      .reset_phy = AR2315_RESET_EPHY0,
-+      .phy_base = AR2315_ENET0,
++      .phy_base = KSEG1ADDR(AR2315_ENET0),
 +      .config = &ar231x_board,
 +};
 +
@@ -2495,13 +2519,13 @@
 +static inline u32
 +spiflash_read_reg(int reg)
 +{
-+      return ar231x_read_reg(KSEG1ADDR(AR2315_SPI) + reg);
++      return ar231x_read_reg(AR2315_SPI + reg);
 +}
 +
 +static inline void
 +spiflash_write_reg(int reg, u32 data)
 +{
-+      ar231x_write_reg(KSEG1ADDR(AR2315_SPI) + reg, data);
++      ar231x_write_reg(AR2315_SPI + reg, data);
 +}
 +
 +static u32
@@ -2630,7 +2654,7 @@
 +      ar2315_init_gpio();
 +      platform_device_register(&ar2315_wdt);
 +      platform_device_register(&ar2315_spiflash);
-+      ar231x_add_ethernet(0, AR2315_ENET0, AR2315_IRQ_ENET0_INTRS,
++      ar231x_add_ethernet(0, KSEG1ADDR(AR2315_ENET0), AR2315_IRQ_ENET0_INTRS,
 +              &ar2315_eth_data);
 +      ar231x_add_wmac(0, AR2315_WLAN0, AR2315_IRQ_WLAN0_INTRS);
 +