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

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

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 694841dd10eed1bf51b67099fe6bff35a1b41479..76e4b5c39734964beb58df289b1e2710bf01cb5f 100644 (file)
--- 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
@@ -145,7 +145,7 @@ int cpu_mmc_init (bd_t * bis)
 }
 
 #ifdef CONFIG_MXC_UART
-void mx25_uart_init_pins (void)
+void mx25_uart1_init_pins(void)
 {
        struct iomuxc_mux_ctl *muxctl;
        struct iomuxc_pad_ctl *padctl;
@@ -260,4 +260,16 @@ void mx25_fec_init_pins (void)
        writel (outpadctl, &padctl->pad_fec_tdata1);
 
 }
+
+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[i] = readl(&fuse->mac_addr[i]) & 0xff;
+}
 #endif /* CONFIG_FEC_MXC */