[kernel] generic/2.6.28: fix yaffs cvs patch

[openwrt.git] / target / linux / ixp4xx / patches-2.6.28 / 500-usr8200_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.28/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.28/500-usr8200_support.patch
index ef818c7..802854c 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.28/500-usr8200_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.28/500-usr8200_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -97,6 +97,14 @@ config MACH_SIDEWINDER
+@@ -98,6 +98,14 @@ config MACH_SIDEWINDER

          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com
  
          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com
  


@@ -116,7 +116,7 @@
 +subsys_initcall(usr8200_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
 +subsys_initcall(usr8200_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c

-@@ -0,0 +1,211 @@
+@@ -0,0 +1,212 @@

 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
 + *
 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
 + *


@@ -285,6 +285,7 @@
 +static struct platform_device usr8200_rtc = {
 +      .name           = "rtc7301",
 +      .id             = 0,
 +static struct platform_device usr8200_rtc = {
 +      .name           = "rtc7301",
 +      .id             = 0,

++      .num_resources  = 1,

 +      .resource       = &usr8200_rtc_resources,
 +};
 +
 +      .resource       = &usr8200_rtc_resources,
 +};
 +


@@ -308,7 +309,7 @@
 +      usr8200_rtc_resources.end = IXP4XX_EXP_BUS_BASE(2) + 0x01ff;
 +
 +      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
 +      usr8200_rtc_resources.end = IXP4XX_EXP_BUS_BASE(2) + 0x01ff;
 +
 +      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;

-+      *IXP4XX_EXP_CS2 = IXP4XX_EXP_BUS_SIZE(0) | IXP4XX_EXP_BUS_WR_EN |
++      *IXP4XX_EXP_CS2 = 0x3fff000 | IXP4XX_EXP_BUS_SIZE(0) | IXP4XX_EXP_BUS_WR_EN |

 +                        IXP4XX_EXP_BUS_CS_EN | IXP4XX_EXP_BUS_BYTE_EN;
 +      *IXP4XX_GPIO_GPCLKR = 0x01100000;
 +
 +                        IXP4XX_EXP_BUS_CS_EN | IXP4XX_EXP_BUS_BYTE_EN;
 +      *IXP4XX_GPIO_GPCLKR = 0x01100000;
 +