KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Magicbox CF driver cleanup

Browse source 
SVN-Revision: 16925
This commit is contained in:
Gabor Juhos 2009-07-20 06:57:01 +00:00
parent e315e7a2ce
commit d522d7d6e3
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
View file

@ -24,7 +24,7 @@
obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o
--- /dev/null --- /dev/null
+++ b/drivers/ide/magicbox_ide.c +++ 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/of_platform.h>
+#include <linux/ide.h> +#include <linux/ide.h>
+ +
+#include <asm/dcr-native.h>
+
+#define DRV_DESC "IDE driver for Magicbox 2.0 onboard CF slot" +#define DRV_DESC "IDE driver for Magicbox 2.0 onboard CF slot"
+#define DRV_NAME "magicbox_cf" +#define DRV_NAME "magicbox_cf"
+ +
@ -239,6 +237,9 @@
+ * with CS1 active instead of CS0 + * with CS1 active instead of CS0
+ */ + */
+ hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2); + 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; + magicbox_ide_setup_hw(&hw, base, ctrl, irq);
+ hw.chipset = ide_generic;
+ hw.ack_intr = NULL;
+ +
+ ret = ide_host_add(&magicbox_ide_port_info, hws, &host); + ret = ide_host_add(&magicbox_ide_port_info, hws, &host);
+ if (ret) + if (ret)