aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-07-20 06:57:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-07-20 06:57:01 +0000
commitd522d7d6e31e2552e7956b73d01fba983ea7e6d4 (patch)
treef51998668a31ea5205216faae4b0543eb53cb026 /target
parente315e7a2ce5c4e846bcbd40635b2e0ab5e36474d (diff)
downloadupstream-d522d7d6e31e2552e7956b73d01fba983ea7e6d4.tar.gz
upstream-d522d7d6e31e2552e7956b73d01fba983ea7e6d4.tar.bz2
upstream-d522d7d6e31e2552e7956b73d01fba983ea7e6d4.zip
Magicbox CF driver cleanup
SVN-Revision: 16925
Diffstat (limited to 'target')
-rw-r--r--target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch13
1 files changed, 5 insertions, 8 deletions
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 4d396bcdca..ebd9b339e9 100644
--- 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
@@ -24,7 +24,7 @@
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.
+ *
@@ -44,8 +44,6 @@
+#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"
+
@@ -239,6 +237,9 @@
+ * 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,
@@ -271,12 +272,8 @@
+ goto err_unmap_base;
+ }
+
-+ magicbox_ide_setup_hw(&hw, base, ctrl, irq);
-+
+ 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)