diff options
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 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/mmc/sh_mmcif.h> | 12 | #include <linux/mmc/sh_mmcif.h> |
13 | #include <mach/mmcif.h> | 13 | #include <mach/mmc.h> |
14 | 14 | ||
15 | #define MMCIF_BASE (void __iomem *)0xe6bd0000 | 15 | #define MMCIF_BASE (void __iomem *)0xe6bd0000 |
16 | 16 | ||
@@ -41,8 +41,8 @@ | |||
41 | */ | 41 | */ |
42 | asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) | 42 | asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) |
43 | { | 43 | { |
44 | mmcif_init_progress(); | 44 | mmc_init_progress(); |
45 | mmcif_update_progress(MMCIF_PROGRESS_ENTER); | 45 | mmc_update_progress(MMCIF_PROGRESS_ENTER); |
46 | 46 | ||
47 | /* Initialise MMC | 47 | /* Initialise MMC |
48 | * registers: PORT84CR-PORT92CR | 48 | * registers: PORT84CR-PORT92CR |
@@ -68,12 +68,12 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) | |||
68 | /* Enable clock to MMC hardware block */ | 68 | /* Enable clock to MMC hardware block */ |
69 | __raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3); | 69 | __raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3); |
70 | 70 | ||
71 | mmcif_update_progress(MMCIF_PROGRESS_INIT); | 71 | mmc_update_progress(MMCIF_PROGRESS_INIT); |
72 | 72 | ||
73 | /* setup MMCIF hardware */ | 73 | /* setup MMCIF hardware */ |
74 | sh_mmcif_boot_init(MMCIF_BASE); | 74 | sh_mmcif_boot_init(MMCIF_BASE); |
75 | 75 | ||
76 | mmcif_update_progress(MMCIF_PROGRESS_LOAD); | 76 | mmc_update_progress(MMCIF_PROGRESS_LOAD); |
77 | 77 | ||
78 | /* load kernel via MMCIF interface */ | 78 | /* load kernel via MMCIF interface */ |
79 | sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */ | 79 | 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) | |||
83 | /* Disable clock to MMC hardware block */ | 83 | /* Disable clock to MMC hardware block */ |
84 | __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); | 84 | __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); |
85 | 85 | ||
86 | mmcif_update_progress(MMCIF_PROGRESS_DONE); | 86 | mmc_update_progress(MMCIF_PROGRESS_DONE); |
87 | } | 87 | } |