upgrade iop32x to 2.6.30

[openwrt.git] / target / linux / ppc40x / patches-2.6.30 / 100-magicbox-ide-driver.patch

diff --git a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch b/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
index 4d396bc..d6907f9 100644 (file)
--- a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
+++ b/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
@@ -6,7 +6,7 @@
  
 +config BLK_DEV_IDE_MAGICBOX
 +      tristate "Magicbox CF card support"
  
 +config BLK_DEV_IDE_MAGICBOX
 +      tristate "Magicbox CF card support"

-+      depends on MAGICBOXV2 || OPENRB_LIGHT
++      depends on MAGICBOX || OPENRB_LIGHT

 +      select IDE_XFER_MODE
 +
  config BLK_DEV_IDE_TX4938
 +      select IDE_XFER_MODE
 +
  config BLK_DEV_IDE_TX4938


@@ -24,7 +24,7 @@
  obj-$(CONFIG_BLK_DEV_IDE_TX4939)      += tx4939ide.o
 --- /dev/null
 +++ b/drivers/ide/magicbox_ide.c
  obj-$(CONFIG_BLK_DEV_IDE_TX4939)      += tx4939ide.o
 --- /dev/null
 +++ b/drivers/ide/magicbox_ide.c

-@@ -0,0 +1,296 @@
+@@ -0,0 +1,293 @@

 +/*
 + *  IDE driver for the MagicBox 2.0 onboard CompactFlash slot.
 + *
 +/*
 + *  IDE driver for the MagicBox 2.0 onboard CompactFlash slot.
 + *


@@ -44,8 +44,6 @@
 +#include <linux/of_platform.h>
 +#include <linux/ide.h>
 +
 +#include <linux/of_platform.h>
 +#include <linux/ide.h>
 +

-+#include <asm/dcr-native.h>
-+

 +#define DRV_DESC      "IDE driver for Magicbox 2.0 onboard CF slot"
 +#define DRV_NAME      "magicbox_cf"
 +
 +#define DRV_DESC      "IDE driver for Magicbox 2.0 onboard CF slot"
 +#define DRV_NAME      "magicbox_cf"
 +


@@ -239,6 +237,9 @@
 +       * with CS1 active instead of CS0
 +       */
 +      hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2);
 +       * with CS1 active instead of CS0
 +       */
 +      hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2);

++      hw->irq = irq;
++      hw->chipset = ide_generic;
++      hw->ack_intr = NULL;

 +}
 +
 +static int __devinit magicbox_ide_of_probe(struct of_device *op,
 +}
 +
 +static int __devinit magicbox_ide_of_probe(struct of_device *op,


@@ -271,12 +272,8 @@
 +              goto err_unmap_base;
 +      }
 +
 +              goto err_unmap_base;
 +      }
 +

-+      magicbox_ide_setup_hw(&hw, base, ctrl, irq);
-+

 +      hw.dev = &op->dev;
 +      hw.dev = &op->dev;

-+      hw.irq = irq;
-+      hw.chipset = ide_generic;
-+      hw.ack_intr = NULL;
++      magicbox_ide_setup_hw(&hw, base, ctrl, irq);

 +
 +      ret = ide_host_add(&magicbox_ide_port_info, hws, &host);
 +      if (ret)
 +
 +      ret = ide_host_add(&magicbox_ide_port_info, hws, &host);
 +      if (ret)