[realview] update to kernel 3.0

[openwrt.git] / target / linux / lantiq / patches-2.6.39 / 410-spi2.patch

diff --git a/target/linux/lantiq/patches-2.6.39/410-spi2.patch b/target/linux/lantiq/patches-2.6.39/410-spi2.patch
index e37790a..f84aa9f 100644 (file)
--- a/target/linux/lantiq/patches-2.6.39/410-spi2.patch
+++ b/target/linux/lantiq/patches-2.6.39/410-spi2.patch
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
  
 +config SPI_LANTIQ
 +      tristate "Lantiq SoC SPI controller"
  
 +config SPI_LANTIQ
 +      tristate "Lantiq SoC SPI controller"

-+      depends on SOC_LANTIQ_XWAY
++      depends on SOC_TYPE_XWAY

 +      select SPI_BITBANG
 +      help
 +        This driver supports the Lantiq SoC SPI controller in master
 +      select SPI_BITBANG
 +      help
 +        This driver supports the Lantiq SoC SPI controller in master


@@ -37,7 +37,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
  obj-$(CONFIG_SPI_PXA2XX_PCI)          += pxa2xx_spi_pci.o
 --- /dev/null
 +++ b/drivers/spi/spi_lantiq.c
  obj-$(CONFIG_SPI_PXA2XX_PCI)          += pxa2xx_spi_pci.o
 --- /dev/null
 +++ b/drivers/spi/spi_lantiq.c

-@@ -0,0 +1,1063 @@
+@@ -0,0 +1,1062 @@

 +/*
 + * Lantiq SoC SPI controller
 + *
 +/*
 + * Lantiq SoC SPI controller
 + *


@@ -64,8 +64,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
 +#include <linux/spi/spi.h>
 +#include <linux/spi/spi_bitbang.h>
 +
 +#include <linux/spi/spi.h>
 +#include <linux/spi/spi_bitbang.h>
 +

-+#include <xway.h>
-+#include <xway_irq.h>
++#include <lantiq_soc.h>

 +#include <lantiq_platform.h>
 +
 +#define LTQ_SPI_CLC           0x00    /* Clock control */
 +#include <lantiq_platform.h>
 +
 +#define LTQ_SPI_CLC           0x00    /* Clock control */