[kernel/2.6.38] refresh patches

[openwrt.git] / target / linux / cns3xxx / patches / 052-cns3xxx_spi.patch

diff --git a/target/linux/cns3xxx/patches/052-cns3xxx_spi.patch b/target/linux/cns3xxx/patches/052-cns3xxx_spi.patch
index 1432800..f002bd3 100644 (file)
--- a/target/linux/cns3xxx/patches/052-cns3xxx_spi.patch
+++ b/target/linux/cns3xxx/patches/052-cns3xxx_spi.patch
@@ -1,6 +1,6 @@
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig

-@@ -114,6 +114,13 @@ config SPI_BUTTERFLY
+@@ -117,6 +117,13 @@ config SPI_BUTTERFLY

          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  


@@ -16,14 +16,14 @@
        depends on (M520x || M523x || M5249 || M527x || M528x || M532x)
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
        depends on (M520x || M523x || M5249 || M527x || M528x || M532x)
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile

-@@ -55,6 +55,7 @@ obj-$(CONFIG_SPI_SH_SCI)             += spi_sh_sci.
- obj-$(CONFIG_SPI_SH_MSIOF)            += spi_sh_msiof.o
- obj-$(CONFIG_SPI_STMP3XXX)            += spi_stmp.o
- obj-$(CONFIG_SPI_NUC900)              += spi_nuc900.o
+@@ -18,6 +18,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi-bfin5xx.
+ obj-$(CONFIG_SPI_BFIN_SPORT)          += spi-bfin-sport.o
+ obj-$(CONFIG_SPI_BITBANG)             += spi-bitbang.o
+ obj-$(CONFIG_SPI_BUTTERFLY)           += spi-butterfly.o

 +obj-$(CONFIG_SPI_CNS3XXX)             += spi_cns3xxx.o
 +obj-$(CONFIG_SPI_CNS3XXX)             += spi_cns3xxx.o

- 
- # special build for s3c24xx spi driver with fiq support
- spi_s3c24xx_hw-y                      := spi_s3c24xx.o
+ obj-$(CONFIG_SPI_COLDFIRE_QSPI)               += spi-coldfire-qspi.o
+ obj-$(CONFIG_SPI_DAVINCI)             += spi-davinci.o
+ obj-$(CONFIG_SPI_DESIGNWARE)          += spi-dw.o

 --- /dev/null
 +++ b/drivers/spi/spi_cns3xxx.c
 @@ -0,0 +1,449 @@
 --- /dev/null
 +++ b/drivers/spi/spi_cns3xxx.c
 @@ -0,0 +1,449 @@


@@ -492,8 +492,8 @@
  };
  
  /**
  };
  
  /**

---- a/drivers/spi/spi_bitbang.c
-+++ b/drivers/spi/spi_bitbang.c
+--- a/drivers/spi/spi-bitbang.c
++++ b/drivers/spi/spi-bitbang.c

 @@ -329,6 +329,12 @@ static void bitbang_work(struct work_str
                                 */
                                if (!m->is_dma_mapped)
 @@ -329,6 +329,12 @@ static void bitbang_work(struct work_str
                                 */
                                if (!m->is_dma_mapped)