diff options
| author | Simon Horman <horms@verge.net.au> | 2011-03-24 08:04:37 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 17:24:57 +0100 |
| commit | a6558c2d07d5c955fbb0290f68c27164a5567b9a (patch) | |
| tree | dc01b3f881dfab39186e1146bfe4ffd9556aaf73 /arch/arm/boot/compressed/mmcif-sh7372.c | |
| parent | ARM: mach-shmobile: add coherent DMA mask to CEU camera devices (diff) | |
| download | linux-a6558c2d07d5c955fbb0290f68c27164a5567b9a.tar.xz linux-a6558c2d07d5c955fbb0290f68c27164a5567b9a.zip | |
mmc, ARM: Rename SuperH Mobile ARM zboot helpers
These headers and helpers will also be used for SDHI boot
so the mmcif name will start to make a lot less sense.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/boot/compressed/mmcif-sh7372.c')
| -rw-r--r-- | arch/arm/boot/compressed/mmcif-sh7372.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/compressed/mmcif-sh7372.c b/arch/arm/boot/compressed/mmcif-sh7372.c index e6180af241f6..28bcf3cf1a5b 100644 --- a/arch/arm/boot/compressed/mmcif-sh7372.c +++ b/arch/arm/boot/compressed/mmcif-sh7372.c @@ -10,7 +10,7 @@ */ #include <linux/mmc/sh_mmcif.h> -#include <mach/mmcif.h> +#include <mach/mmc.h> #define MMCIF_BASE (void __iomem *)0xe6bd0000 @@ -41,8 +41,8 @@ */ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) { - mmcif_init_progress(); - mmcif_update_progress(MMCIF_PROGRESS_ENTER); + mmc_init_progress(); + mmc_update_progress(MMCIF_PROGRESS_ENTER); /* Initialise MMC * registers: PORT84CR-PORT92CR @@ -68,12 +68,12 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) /* Enable clock to MMC hardware block */ __raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3); - mmcif_update_progress(MMCIF_PROGRESS_INIT); + mmc_update_progress(MMCIF_PROGRESS_INIT); /* setup MMCIF hardware */ sh_mmcif_boot_init(MMCIF_BASE); - mmcif_update_progress(MMCIF_PROGRESS_LOAD); + mmc_update_progress(MMCIF_PROGRESS_LOAD); /* load kernel via MMCIF interface */ sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */ @@ -83,5 +83,5 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) /* Disable clock to MMC hardware block */ __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); - mmcif_update_progress(MMCIF_PROGRESS_DONE); + mmc_update_progress(MMCIF_PROGRESS_DONE); } |