diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-20 06:57:01 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-20 06:57:01 +0000 |
| commit | 1e43b06b8745101f682dc26749427e40c2eac0e4 (patch) | |
| tree | efcd58b935e930b208e8234cc517a8f9e7ca0080 /target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch | |
| parent | 72b37ce64ddc428627fe0b3beb8c3206d1645e48 (diff) | |
[ppc40x] Magicbox CF driver cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16925 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch')
| -rw-r--r-- | target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch | 13 |
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) |