diff options
author | Simon Horman <horms@verge.net.au> | 2011-03-24 03:04:37 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 12:24:57 -0400 |
commit | a6558c2d07d5c955fbb0290f68c27164a5567b9a (patch) | |
tree | dc01b3f881dfab39186e1146bfe4ffd9556aaf73 | |
parent | 05a5f01c68e70f2b290db5faed00990daaff3990 (diff) |
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>
-rw-r--r-- | arch/arm/boot/compressed/mmcif-sh7372.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h (renamed from arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h) | 10 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/mmc-mackerel.h (renamed from arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h) | 11 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/mmc.h (renamed from arch/arm/mach-shmobile/include/mach/mmcif.h) | 10 |
4 files changed, 21 insertions, 22 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 | } |
diff --git a/arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h b/arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h index a8d02be8d2b6..db59fdbda860 100644 --- a/arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h +++ b/arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef MMCIF_AP4EB_H | 1 | #ifndef MMC_AP4EB_H |
2 | #define MMCIF_AP4EB_H | 2 | #define MMC_AP4EB_H |
3 | 3 | ||
4 | #define PORT185CR (void __iomem *)0xe60520b9 | 4 | #define PORT185CR (void __iomem *)0xe60520b9 |
5 | #define PORT186CR (void __iomem *)0xe60520ba | 5 | #define PORT186CR (void __iomem *)0xe60520ba |
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define PORTR191_160DR (void __iomem *)0xe6056014 | 9 | #define PORTR191_160DR (void __iomem *)0xe6056014 |
10 | 10 | ||
11 | static inline void mmcif_init_progress(void) | 11 | static inline void mmc_init_progress(void) |
12 | { | 12 | { |
13 | /* Initialise LEDS1-4 | 13 | /* Initialise LEDS1-4 |
14 | * registers: PORT185CR-PORT188CR (LED1-LED4 Control) | 14 | * registers: PORT185CR-PORT188CR (LED1-LED4 Control) |
@@ -20,10 +20,10 @@ static inline void mmcif_init_progress(void) | |||
20 | __raw_writeb(0x10, PORT188CR); | 20 | __raw_writeb(0x10, PORT188CR); |
21 | } | 21 | } |
22 | 22 | ||
23 | static inline void mmcif_update_progress(int n) | 23 | static inline void mmc_update_progress(int n) |
24 | { | 24 | { |
25 | __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | | 25 | __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | |
26 | (1 << (25 + n)), PORTR191_160DR); | 26 | (1 << (25 + n)), PORTR191_160DR); |
27 | } | 27 | } |
28 | 28 | ||
29 | #endif /* MMCIF_AP4EB_H */ | 29 | #endif /* MMC_AP4EB_H */ |
diff --git a/arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h b/arch/arm/mach-shmobile/include/mach/mmc-mackerel.h index 4b4f6949a868..15d3a9efdec2 100644 --- a/arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h +++ b/arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef MMCIF_MACKEREL_H | 1 | #ifndef MMC_MACKEREL_H |
2 | #define MMCIF_MACKEREL_H | 2 | #define MMC_MACKEREL_H |
3 | 3 | ||
4 | #define PORT0CR (void __iomem *)0xe6051000 | 4 | #define PORT0CR (void __iomem *)0xe6051000 |
5 | #define PORT1CR (void __iomem *)0xe6051001 | 5 | #define PORT1CR (void __iomem *)0xe6051001 |
@@ -9,7 +9,7 @@ | |||
9 | #define PORTR031_000DR (void __iomem *)0xe6055000 | 9 | #define PORTR031_000DR (void __iomem *)0xe6055000 |
10 | #define PORTL159_128DR (void __iomem *)0xe6054010 | 10 | #define PORTL159_128DR (void __iomem *)0xe6054010 |
11 | 11 | ||
12 | static inline void mmcif_init_progress(void) | 12 | static inline void mmc_init_progress(void) |
13 | { | 13 | { |
14 | /* Initialise LEDS0-3 | 14 | /* Initialise LEDS0-3 |
15 | * registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) | 15 | * registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) |
@@ -21,7 +21,7 @@ static inline void mmcif_init_progress(void) | |||
21 | __raw_writeb(0x10, PORT159CR); | 21 | __raw_writeb(0x10, PORT159CR); |
22 | } | 22 | } |
23 | 23 | ||
24 | static inline void mmcif_update_progress(int n) | 24 | static inline void mmc_update_progress(int n) |
25 | { | 25 | { |
26 | unsigned a = 0, b = 0; | 26 | unsigned a = 0, b = 0; |
27 | 27 | ||
@@ -35,5 +35,4 @@ static inline void mmcif_update_progress(int n) | |||
35 | __raw_writel((__raw_readl(PORTL159_128DR) & ~(1 << 31)) | b, | 35 | __raw_writel((__raw_readl(PORTL159_128DR) & ~(1 << 31)) | b, |
36 | PORTL159_128DR); | 36 | PORTL159_128DR); |
37 | } | 37 | } |
38 | 38 | #endif /* MMC_MACKEREL_H */ | |
39 | #endif /* MMCIF_MACKEREL_H */ | ||
diff --git a/arch/arm/mach-shmobile/include/mach/mmcif.h b/arch/arm/mach-shmobile/include/mach/mmc.h index f4dc3279cf03..e11560a525a1 100644 --- a/arch/arm/mach-shmobile/include/mach/mmcif.h +++ b/arch/arm/mach-shmobile/include/mach/mmc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef MMCIF_H | 1 | #ifndef MMC_H |
2 | #define MMCIF_H | 2 | #define MMC_H |
3 | 3 | ||
4 | /************************************************** | 4 | /************************************************** |
5 | * | 5 | * |
@@ -8,11 +8,11 @@ | |||
8 | **************************************************/ | 8 | **************************************************/ |
9 | 9 | ||
10 | #ifdef CONFIG_MACH_AP4EVB | 10 | #ifdef CONFIG_MACH_AP4EVB |
11 | #include "mach/mmcif-ap4eb.h" | 11 | #include "mach/mmc-ap4eb.h" |
12 | #elif CONFIG_MACH_MACKEREL | 12 | #elif CONFIG_MACH_MACKEREL |
13 | #include "mach/mmcif-mackerel.h" | 13 | #include "mach/mmc-mackerel.h" |
14 | #else | 14 | #else |
15 | #error "unsupported board." | 15 | #error "unsupported board." |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #endif /* MMCIF_H */ | 18 | #endif /* MMC_H */ |