[armedslack] Updating RapIDE patch

[Stuart Winter]

Hi!

I wonder if anyone can help with maintaining the RapIDE patch
that ARMedslack's carrying.

ftp://ftp.armedslack.org/armedslack/armedslack-current//source/k/sources/linux-2.6/patches/rapide.patch

The diff between Linux 2.6.21 and 2.6.22 is shown below -- and the
RapIDE patch no longer applies:

I'm not sure whether the changes made in 2.6.22 are significant.
As far as I know, the RapIDE code that is in the Kernel doesn't work
anyway - it's more of a dummy.
I'd like to get the RapIDE patch in ARMedslack into the upstream Kernel if
possible (I don't know if RMK would like the formatting of the code though ;-) )

Can anybody help with making the new patch apply to Linux 2.6.22.1 ?
I have many updates for ARMedslack and am currently building the Kernel
for the RiscPC.

Thanks
s.

--- linux-2.6.21.1/drivers/ide/arm/rapide.c     2007-04-27 22:49:26.000000000 +0100
+++ linux-2.6.22/drivers/ide/arm/rapide.c       2007-07-09 00:32:17.000000000 +0100
@@ -63,8 +63,7 @@
        if (ret)
                goto out;

-       base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                      ecard_resource_len(ec, ECARD_RES_MEMC));
+       base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
        if (!base) {
                ret = -ENOMEM;
                goto release;
@@ -76,12 +75,11 @@
                hwif->gendev.parent = &ec->dev;
                hwif->noprobe = 0;
                probe_hwif_init(hwif);
-               create_proc_ide_interfaces();
+               ide_proc_register_port(hwif);
                ecard_set_drvdata(ec, hwif);
                goto out;
        }

-       iounmap(base);
  release:
        ecard_release_resources(ec);
  out:
@@ -96,7 +94,6 @@

        /* there must be a better way */
        ide_unregister(hwif - ide_hwifs);
-       iounmap(hwif->hwif_data);
        ecard_release_resources(ec);
 }



-- 
The Biscuit Appreciation Society   : www.biscuit.org.uk
Experimental ARM Linux distribution: www.armedslack.org