diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:49:15 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:49:15 +0200 |
| commit | 900a1fe8c8c7acda1d8903af02c2d0d993b770d8 (patch) | |
| tree | b17bb283aa7fe7b31f46fbdfd3496b7f23736840 /arch/arm/cpu/arm926ejs | |
| parent | 4185ae7a7146a77a792e5ba49845e5ca6e95b038 (diff) | |
| parent | 20d98c2cea3398ad93beccd4727a371f41514086 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx25/generic.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/generic.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index 694841dd10..b80a389ed9 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -111,7 +111,7 @@ int print_cpuinfo (void) char buf[32]; printf ("CPU: Freescale i.MX25 at %s MHz\n\n", - strmhz (buf, imx_get_mpllclk ())); + strmhz (buf, imx_get_armclk ())); return 0; } #endif diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index 30cf544712..ae2ce5841c 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -316,6 +316,23 @@ void mx27_fec_init_pins(void) #endif /* CONFIG_FEC_MXC */ #ifdef CONFIG_MXC_MMC +void mx27_sd1_init_pins(void) +{ + int i; + unsigned int mode[] = { + PE18_PF_SD1_D0, + PE19_PF_SD1_D1, + PE20_PF_SD1_D2, + PE21_PF_SD1_D3, + PE22_PF_SD1_CMD, + PE23_PF_SD1_CLK, + }; + + for (i = 0; i < ARRAY_SIZE(mode); i++) + imx_gpio_mode(mode[i]); + +} + void mx27_sd2_init_pins(void) { int i; |