[PATCH V2] arm: mxs: get MAC from OCOTP for MX28EVK

[Sascha Hauer]

On Thu, Jun 14, 2012 at 03:13:03PM +0200, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
> ---
> 
> V2: rewrote code according to Sascha's style guide ;)
> 
>  arch/arm/boards/freescale-mx28-evk/mx28-evk.c |   30 +++++++++++++++++++++++--
>  arch/arm/mach-mxs/Kconfig                     |    1 +
>  2 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
> index 9168ed8..fc395a0 100644
> --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
> +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
> @@ -22,17 +22,18 @@
>  #include <init.h>
>  #include <mci.h>
>  #include <io.h>
> +#include <net.h>
>  
>  #include <mach/clock.h>
>  #include <mach/imx-regs.h>
>  #include <mach/iomux-imx28.h>
>  #include <mach/mci.h>
> +#include <mach/fb.h>
> +#include <mach/ocotp.h>
>  
>  #include <asm/armlinux.h>
>  #include <asm/mmu.h>
>  
> -#include <mach/fb.h>
> -
>  #include <generated/mach-types.h>
>  
>  #define MX28EVK_FEC_PHY_RESET_GPIO	141
> @@ -118,6 +119,27 @@ static struct mxs_mci_platform_data mci_pdata = {
>  };
>  
>  /* fec */
> +void mx28_evk_get_ethaddr(void)

static?

Sascha

> +{
> +	u8 mac_ocotp[3], mac[6];
> +	int ret;
> +
> +	ret = mxs_ocotp_read(mac_ocotp, 3, 0);
> +	if (ret != 3) {
> +		pr_err("Reading MAC from OCOTP failed!\n");
> +		return;
> +	}
> +
> +	mac[0] = 0x00;
> +	mac[1] = 0x04;
> +	mac[2] = 0x9f;
> +	mac[3] = mac_ocotp[2];
> +	mac[4] = mac_ocotp[1];
> +	mac[5] = mac_ocotp[0];
> +
> +	eth_register_ethaddr(0, mac);
> +}
> +
>  static void __init mx28_evk_fec_reset(void)
>  {
>  	mdelay(1);
> @@ -208,6 +230,10 @@ static int mx28_evk_devices_init(void)
>  	add_generic_device("stmfb", 0, NULL, IMX_FB_BASE, 4096,
>  			   IORESOURCE_MEM, &mx28_evk_fb_pdata);
>  
> +	add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0,
> +			IORESOURCE_MEM, NULL);
> +	mx28_evk_get_ethaddr(); /* must be after registering ocotp */
> +
>  	imx_enable_enetclk();
>  	mx28_evk_fec_reset();
>  	add_generic_device("fec_imx", 0, NULL, IMX_FEC0_BASE, 0,
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index 3348a3c..57bd556 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -61,6 +61,7 @@ config MACH_TX28
>  
>  config MACH_MX28EVK
>  	bool "mx28-evk"
> +	select MXS_OCOTP
>  	help
>  	  Say Y here if you are using the Freescale i.MX28-EVK board
>  
> -- 
> 1.7.10
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |