Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sh / boot / romimage / mmcif-sh7724.c

diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c
index 14863d7292cb7d81035fcc692c844412717fdff5..c84e7831018dc12023a1f5a316b7ac9444be3598 100644 (file)
--- a/arch/sh/boot/romimage/mmcif-sh7724.c
+++ b/arch/sh/boot/romimage/mmcif-sh7724.c
@@ -21,9 +21,6 @@
 #define HIZCRC         0xa405015c
 #define DRVCRA         0xa405018a
 
-enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
-       MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
-
 /* SH7724 specific MMCIF loader
  *
  * loads the romImage from an MMC card starting from block 512
@@ -63,7 +60,9 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)
        mmcif_update_progress(MMCIF_PROGRESS_LOAD);
 
        /* load kernel via MMCIF interface */
-       sh_mmcif_boot_slurp(MMCIF_BASE, buf, no_bytes);
+       sh_mmcif_boot_do_read(MMCIF_BASE, 512,
+                             (no_bytes + SH_MMCIF_BBS - 1) / SH_MMCIF_BBS,
+                             buf);
 
        /* disable clock to the MMCIF hardware block */
        __raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2);