Merge branch 'master' of git://git.denx.de/u-boot-mmc

[u-boot] / arch / arm / cpu / arm926ejs / mx27 / generic.c

diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 30cf54471212adea3865fcd7e6d61d8557873ba9..222a8e95eaf51997fee397a0407da4e5d9ff442d 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -271,7 +271,7 @@ void imx_gpio_mode(int gpio_mode)
 }
 
 #ifdef CONFIG_MXC_UART
-void mx27_uart_init_pins(void)
+void mx27_uart1_init_pins(void)
 {
        int i;
        unsigned int mode[] = {
@@ -313,9 +313,38 @@ void mx27_fec_init_pins(void)
        for (i = 0; i < ARRAY_SIZE(mode); i++)
                imx_gpio_mode(mode[i]);
 }
+
+void imx_get_mac_from_fuse(unsigned char *mac)
+{
+       int i;
+       struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+       struct fuse_bank *bank = &iim->bank[0];
+       struct fuse_bank0_regs *fuse =
+                       (struct fuse_bank0_regs *)bank->fuse_regs;
+
+       for (i = 0; i < 6; i++)
+               mac[6 - 1 - i] = readl(&fuse->mac_addr[i]) & 0xff;
+}
 #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;