Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
mmc: Add MMC_PROGRESS_*
This is my second attempt to make this enum generally available.
The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h.
However this is not sufficiently generic as the enum will be
used by SDHI boot code.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
authored by Simon Horman and committed by Paul Mundt 9d9659b6 a6558c2d
+5
-4
arch/arm/boot/compressed/mmcif-sh7372.c
+5
-4
arch/arm/boot/compressed/mmcif-sh7372.c
···
10
10
*/
11
11
12
12
#include <linux/mmc/sh_mmcif.h>
13
+
#include <linux/mmc/boot.h>
13
14
#include <mach/mmc.h>
14
15
15
16
#define MMCIF_BASE (void __iomem *)0xe6bd0000
···
43
42
asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
44
43
{
45
44
mmc_init_progress();
46
-
mmc_update_progress(MMCIF_PROGRESS_ENTER);
45
+
mmc_update_progress(MMC_PROGRESS_ENTER);
47
46
48
47
/* Initialise MMC
49
48
* registers: PORT84CR-PORT92CR
···
69
68
/* Enable clock to MMC hardware block */
70
69
__raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3);
71
70
72
-
mmc_update_progress(MMCIF_PROGRESS_INIT);
71
+
mmc_update_progress(MMC_PROGRESS_INIT);
73
72
74
73
/* setup MMCIF hardware */
75
74
sh_mmcif_boot_init(MMCIF_BASE);
76
75
77
-
mmc_update_progress(MMCIF_PROGRESS_LOAD);
76
+
mmc_update_progress(MMC_PROGRESS_LOAD);
78
77
79
78
/* load kernel via MMCIF interface */
80
79
sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */
···
84
83
/* Disable clock to MMC hardware block */
85
84
__raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3);
86
85
87
-
mmc_update_progress(MMCIF_PROGRESS_DONE);
86
+
mmc_update_progress(MMC_PROGRESS_DONE);
88
87
}
+5
-4
arch/sh/boot/romimage/mmcif-sh7724.c
+5
-4
arch/sh/boot/romimage/mmcif-sh7724.c
···
9
9
*/
10
10
11
11
#include <linux/mmc/sh_mmcif.h>
12
+
#include <linux/mmc/boot.h>
12
13
#include <mach/romimage.h>
13
14
14
15
#define MMCIF_BASE (void __iomem *)0xa4ca0000
···
30
29
*/
31
30
asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)
32
31
{
33
-
mmcif_update_progress(MMCIF_PROGRESS_ENTER);
32
+
mmcif_update_progress(MMC_PROGRESS_ENTER);
34
33
35
34
/* enable clock to the MMCIF hardware block */
36
35
__raw_writel(__raw_readl(MSTPCR2) & ~0x20000000, MSTPCR2);
···
53
52
/* high drive capability for MMC pins */
54
53
__raw_writew(__raw_readw(DRVCRA) | 0x3000, DRVCRA);
55
54
56
-
mmcif_update_progress(MMCIF_PROGRESS_INIT);
55
+
mmcif_update_progress(MMC_PROGRESS_INIT);
57
56
58
57
/* setup MMCIF hardware */
59
58
sh_mmcif_boot_init(MMCIF_BASE);
60
59
61
-
mmcif_update_progress(MMCIF_PROGRESS_LOAD);
60
+
mmcif_update_progress(MMC_PROGRESS_LOAD);
62
61
63
62
/* load kernel via MMCIF interface */
64
63
sh_mmcif_boot_do_read(MMCIF_BASE, 512,
···
68
67
/* disable clock to the MMCIF hardware block */
69
68
__raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2);
70
69
71
-
mmcif_update_progress(MMCIF_PROGRESS_DONE);
70
+
mmcif_update_progress(MMC_PROGRESS_DONE);
72
71
}
+7
include/linux/mmc/boot.h
+7
include/linux/mmc/boot.h
-3
include/linux/mmc/sh_mmcif.h
-3
include/linux/mmc/sh_mmcif.h
···
104
104
105
105
#define SH_MMCIF_BBS 512 /* boot block size */
106
106
107
-
enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
108
-
MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
109
-
110
107
static inline void sh_mmcif_boot_cmd_send(void __iomem *base,
111
108
unsigned long cmd, unsigned long arg)
112
109
{