target/linux/ar71xx/patches-3.2/304-spi-ap83-3.2-fixes.patch

   1 --- a/drivers/spi/spi-ap83.c
   2 +++ b/drivers/spi/spi-ap83.c
   3 @@ -10,6 +10,7 @@
   4   */
   5
   6  #include <linux/kernel.h>
   7 +#include <linux/module.h>
   8  #include <linux/init.h>
   9  #include <linux/delay.h>
  10  #include <linux/spinlock.h>
  11 @@ -21,8 +22,7 @@
  12  #include <linux/bitops.h>
  13  #include <linux/gpio.h>
  14
  15 -#include <asm/mach-ar71xx/ar71xx.h>
  16 -#include <asm/mach-ar71xx/platform.h>
  17 +#include <asm/mach-ath79/ath79.h>
  18
  19  #define DRV_DESC       "Atheros AP83 board SPI Controller driver"
  20  #define DRV_VERSION    "0.1.0"
  21 @@ -106,7 +106,7 @@ static void ap83_spi_chipselect(struct s
  22         dev_dbg(&spi->dev, "set CS to %d\n", (on) ? 0 : 1);
  23
  24         if (on) {
  25 -               ar71xx_flash_acquire();
  26 +               ath79_flash_acquire();
  27
  28                 sp->addr = 0;
  29                 ap83_spi_rr(sp, sp->addr);
  30 @@ -114,7 +114,7 @@ static void ap83_spi_chipselect(struct s
  31                 gpio_set_value(AP83_SPI_GPIO_CS, 0);
  32         } else {
  33                 gpio_set_value(AP83_SPI_GPIO_CS, 1);
  34 -               ar71xx_flash_release();
  35 +               ath79_flash_release();
  36         }
  37  }
  38
  39 @@ -127,7 +127,7 @@ static void ap83_spi_chipselect(struct s
  40
  41  #define EXPAND_BITBANG_TXRX
  42  #include <linux/spi/spi_bitbang.h>
  43 -#include "spi_bitbang_txrx.h"
  44 +#include "spi-bitbang-txrx.h"
  45
  46  static u32 ap83_spi_txrx_mode0(struct spi_device *spi,
  47                                unsigned nsecs, u32 word, u8 bits)