tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Simon Horman and committed by Paul Mundt a6558c2d 05a5f01c

+21 -22
unified split
+6 -6
arch/arm/boot/compressed/mmcif-sh7372.c
··· 10 */ 11 12 #include <linux/mmc/sh_mmcif.h> 13 - #include <mach/mmcif.h> 14 15 #define MMCIF_BASE (void __iomem *)0xe6bd0000 16 ··· 41 */ 42 asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) 43 { 44 - mmcif_init_progress(); 45 - mmcif_update_progress(MMCIF_PROGRESS_ENTER); 46 47 /* Initialise MMC 48 * registers: PORT84CR-PORT92CR ··· 68 /* Enable clock to MMC hardware block */ 69 __raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3); 70 71 - mmcif_update_progress(MMCIF_PROGRESS_INIT); 72 73 /* setup MMCIF hardware */ 74 sh_mmcif_boot_init(MMCIF_BASE); 75 76 - mmcif_update_progress(MMCIF_PROGRESS_LOAD); 77 78 /* load kernel via MMCIF interface */ 79 sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */ ··· 83 /* Disable clock to MMC hardware block */ 84 __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); 85 86 - mmcif_update_progress(MMCIF_PROGRESS_DONE); 87 }
··· 10 */ 11 12 #include <linux/mmc/sh_mmcif.h> 13 + #include <mach/mmc.h> 14 15 #define MMCIF_BASE (void __iomem *)0xe6bd0000 16 ··· 41 */ 42 asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) 43 { 44 + mmc_init_progress(); 45 + mmc_update_progress(MMCIF_PROGRESS_ENTER); 46 47 /* Initialise MMC 48 * registers: PORT84CR-PORT92CR ··· 68 /* Enable clock to MMC hardware block */ 69 __raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3); 70 71 + mmc_update_progress(MMCIF_PROGRESS_INIT); 72 73 /* setup MMCIF hardware */ 74 sh_mmcif_boot_init(MMCIF_BASE); 75 76 + mmc_update_progress(MMCIF_PROGRESS_LOAD); 77 78 /* load kernel via MMCIF interface */ 79 sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is at block 2 */ ··· 83 /* Disable clock to MMC hardware block */ 84 __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); 85 86 + mmc_update_progress(MMCIF_PROGRESS_DONE); 87 }
+5 -5
arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h
··· 1 - #ifndef MMCIF_AP4EB_H 2 - #define MMCIF_AP4EB_H 3 4 #define PORT185CR (void __iomem *)0xe60520b9 5 #define PORT186CR (void __iomem *)0xe60520ba ··· 8 9 #define PORTR191_160DR (void __iomem *)0xe6056014 10 11 - static inline void mmcif_init_progress(void) 12 { 13 /* Initialise LEDS1-4 14 * registers: PORT185CR-PORT188CR (LED1-LED4 Control) ··· 20 __raw_writeb(0x10, PORT188CR); 21 } 22 23 - static inline void mmcif_update_progress(int n) 24 { 25 __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | 26 (1 << (25 + n)), PORTR191_160DR); 27 } 28 29 - #endif /* MMCIF_AP4EB_H */
··· 1 + #ifndef MMC_AP4EB_H 2 + #define MMC_AP4EB_H 3 4 #define PORT185CR (void __iomem *)0xe60520b9 5 #define PORT186CR (void __iomem *)0xe60520ba ··· 8 9 #define PORTR191_160DR (void __iomem *)0xe6056014 10 11 + static inline void mmc_init_progress(void) 12 { 13 /* Initialise LEDS1-4 14 * registers: PORT185CR-PORT188CR (LED1-LED4 Control) ··· 20 __raw_writeb(0x10, PORT188CR); 21 } 22 23 + static inline void mmc_update_progress(int n) 24 { 25 __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | 26 (1 << (25 + n)), PORTR191_160DR); 27 } 28 29 + #endif /* MMC_AP4EB_H */
+5 -6
arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h arch/arm/mach-shmobile/include/mach/mmc-mackerel.h
··· 1 - #ifndef MMCIF_MACKEREL_H 2 - #define MMCIF_MACKEREL_H 3 4 #define PORT0CR (void __iomem *)0xe6051000 5 #define PORT1CR (void __iomem *)0xe6051001 ··· 9 #define PORTR031_000DR (void __iomem *)0xe6055000 10 #define PORTL159_128DR (void __iomem *)0xe6054010 11 12 - static inline void mmcif_init_progress(void) 13 { 14 /* Initialise LEDS0-3 15 * registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) ··· 21 __raw_writeb(0x10, PORT159CR); 22 } 23 24 - static inline void mmcif_update_progress(int n) 25 { 26 unsigned a = 0, b = 0; 27 ··· 35 __raw_writel((__raw_readl(PORTL159_128DR) & ~(1 << 31)) | b, 36 PORTL159_128DR); 37 } 38 - 39 - #endif /* MMCIF_MACKEREL_H */
··· 1 + #ifndef MMC_MACKEREL_H 2 + #define MMC_MACKEREL_H 3 4 #define PORT0CR (void __iomem *)0xe6051000 5 #define PORT1CR (void __iomem *)0xe6051001 ··· 9 #define PORTR031_000DR (void __iomem *)0xe6055000 10 #define PORTL159_128DR (void __iomem *)0xe6054010 11 12 + static inline void mmc_init_progress(void) 13 { 14 /* Initialise LEDS0-3 15 * registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) ··· 21 __raw_writeb(0x10, PORT159CR); 22 } 23 24 + static inline void mmc_update_progress(int n) 25 { 26 unsigned a = 0, b = 0; 27 ··· 35 __raw_writel((__raw_readl(PORTL159_128DR) & ~(1 << 31)) | b, 36 PORTL159_128DR); 37 } 38 + #endif /* MMC_MACKEREL_H */
+5 -5
arch/arm/mach-shmobile/include/mach/mmcif.h arch/arm/mach-shmobile/include/mach/mmc.h
··· 1 - #ifndef MMCIF_H 2 - #define MMCIF_H 3 4 /************************************************** 5 * ··· 8 **************************************************/ 9 10 #ifdef CONFIG_MACH_AP4EVB 11 - #include "mach/mmcif-ap4eb.h" 12 #elif CONFIG_MACH_MACKEREL 13 - #include "mach/mmcif-mackerel.h" 14 #else 15 #error "unsupported board." 16 #endif 17 18 - #endif /* MMCIF_H */
··· 1 + #ifndef MMC_H 2 + #define MMC_H 3 4 /************************************************** 5 * ··· 8 **************************************************/ 9 10 #ifdef CONFIG_MACH_AP4EVB 11 + #include "mach/mmc-ap4eb.h" 12 #elif CONFIG_MACH_MACKEREL 13 + #include "mach/mmc-mackerel.h" 14 #else 15 #error "unsupported board." 16 #endif 17 18 + #endif /* MMC_H */