On Mon, Aug 16, 2010 at 05:10:35PM +0300, Baruch Siach wrote:
> ---
> arch/arm/mach-imx/iim.c | 22 +++++++++++++++++++++-
> arch/arm/mach-imx/include/mach/iim.h | 13 +++++++++++++
> 2 files changed, 34 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
> index 73369b7..9d14d35 100644
> --- a/arch/arm/mach-imx/iim.c
> +++ b/arch/arm/mach-imx/iim.c
> @@ -29,6 +29,8 @@
>
> #define DRIVERNAME "imx_iim"
>
> +static unsigned long mac_addr_base;
> +
> static int do_fuse_sense(unsigned long reg_base, unsigned int bank,
> unsigned int row)
> {
> @@ -224,6 +226,11 @@ static int imx_iim_blow_enable_set(struct device_d *dev, struct param_d *param,
>
> static int imx_iim_probe(struct device_d *dev)
> {
> + struct imx_iim_platform_data *pdata = dev->platform_data;
> +
> + if (pdata)
> + mac_addr_base = pdata->mac_addr_base;
> +
> return 0;
> }
>
> @@ -288,4 +295,17 @@ static int imx_iim_init(void)
>
> return 0;
> }
> -device_initcall(imx_iim_init);
> +coredevice_initcall(imx_iim_init);
> +
> +int imx_iim_get_mac(unsigned char *mac)
> +{
> + int i;
> +
> + if (mac_addr_base == 0)
> + return -EINVAL;
> +
> + for (i = 0; i < 6; i++)
> + mac[i] = readb(mac_addr_base + i*4);
> +
> + return 0;
> +}
> diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h
> index 6e13547..4d54cc0 100644
> --- a/arch/arm/mach-imx/include/mach/iim.h
> +++ b/arch/arm/mach-imx/include/mach/iim.h
> @@ -39,4 +39,17 @@
> #define IIM_SCS2 0x0034
> #define IIM_SCS3 0x0038
>
> +struct imx_iim_platform_data {
> + unsigned long mac_addr_base;
> +};
> +
> +#ifdef CONFIG_IMX_IIM
> +int imx_iim_get_mac(unsigned char *mac);
> +#else
> +int imx_iim_get_mac(unsigned char *mac)
static inline please. Otherwise linking fails if this function gets a
second user.
Otherwise the series looks fine. Thanks for your work.
Sascha
--
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 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
