mmc: pxa: Flip over the remaining boards to pxa_mmc_generic

Some of the boards still used the old PXA_MMC driver instead of the
new generic one. Use the new one instead so the old can be removed
and the generic MMC framework can be properly used.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Marek Vasut 2012-09-30 10:09:49 +00:00 committed by Andy Fleming
parent 13243f2eaf
commit 831f849f79
8 changed files with 44 additions and 4 deletions

View file

@ -29,6 +29,7 @@
#include <netdev.h> #include <netdev.h>
#include <asm/arch/pxa.h> #include <asm/arch/pxa.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include <asm/arch/regs-mmc.h>
#include <asm/io.h> #include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -56,6 +57,14 @@ int board_init (void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_MMC
int board_mmc_init(bd_t *bis)
{
pxa_mmc_register(0);
return 0;
}
#endif
int board_late_init(void) int board_late_init(void)
{ {
setenv("stdout", "serial"); setenv("stdout", "serial");

View file

@ -24,6 +24,7 @@
#include <serial.h> #include <serial.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/pxa.h> #include <asm/arch/pxa.h>
#include <asm/arch/regs-mmc.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -51,6 +52,14 @@ int board_init(void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_MMC
int board_mmc_init(bd_t *bis)
{
pxa_mmc_register(0);
return 0;
}
#endif
int dram_init(void) int dram_init(void)
{ {
pxa2xx_dram_init(); pxa2xx_dram_init();

View file

@ -35,6 +35,7 @@
#include <command.h> #include <command.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/pxa.h> #include <asm/arch/pxa.h>
#include <asm/arch/regs-mmc.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -77,6 +78,14 @@ int board_init (void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_MMC
int board_mmc_init(bd_t *bis)
{
pxa_mmc_register(0);
return 0;
}
#endif
int board_late_init(void) int board_late_init(void)
{ {
setenv("stdout", "serial"); setenv("stdout", "serial");

View file

@ -34,6 +34,7 @@
#include <common.h> #include <common.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa.h> #include <asm/arch/pxa.h>
#include <asm/arch/regs-mmc.h>
#include <netdev.h> #include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
@ -152,3 +153,11 @@ int board_eth_init(bd_t *bis)
return dm9000_initialize(bis); return dm9000_initialize(bis);
} }
#endif #endif
#ifdef CONFIG_CMD_MMC
int board_mmc_init(bd_t *bis)
{
pxa_mmc_register(0);
return 0;
}
#endif

View file

@ -130,7 +130,8 @@
#define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define CONFIG_PXA_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif #endif

View file

@ -77,7 +77,8 @@
*/ */
#ifdef CONFIG_CMD_MMC #ifdef CONFIG_CMD_MMC
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_PXA_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2

View file

@ -245,7 +245,8 @@
#define RTC 1 /* enable 32KHz osc */ #define RTC 1 /* enable 32KHz osc */
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define CONFIG_PXA_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif #endif

View file

@ -170,7 +170,8 @@
#define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ #define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define CONFIG_PXA_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif #endif