[U-Boot] [PATCH] net: sh_eth: Add support R8A7740 of rmobile (arm core)

[Nobuhiro Iwamatsu]

Hi, Joe.

Could you pick this patch to your repository?

Best regards,
  Nobuhiro

On Fri, Aug 3, 2012 at 5:08 PM, Nobuhiro Iwamatsu
<nobuhiro.iwamatsu.yj at renesas.com> wrote:
> R8A7740 of rmobile has ethernet device, and this is same IP of
> sh-ether. This support R8A7740 of rmobile.
>
> Signed-off-by: Hideyuki Sano <hideyuki.sano.dn at renesas.com>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
> ---
>  drivers/net/sh_eth.c |    2 +-
>  drivers/net/sh_eth.h |   14 ++++++++++++--
>  2 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
> index 09af860..2d9cc32 100644
> --- a/drivers/net/sh_eth.c
> +++ b/drivers/net/sh_eth.c
> @@ -394,7 +394,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
>         sh_eth_write(eth, TPAUSER_TPAUSE, TPAUSER);
>  #endif
>
> -#if defined(CONFIG_CPU_SH7734)
> +#if defined(CONFIG_CPU_SH7734) || defined(CONFIG_R8A7740)
>         sh_eth_write(eth, CONFIG_SH_ETHER_SH7734_MII, RMII_MII);
>  #endif
>         /* Configure phy */
> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
> index 3703c55..61d2df9 100644
> --- a/drivers/net/sh_eth.h
> +++ b/drivers/net/sh_eth.h
> @@ -1,8 +1,8 @@
>  /*
>   * sh_eth.h - Driver for Renesas SuperH ethernet controler.
>   *
> - * Copyright (C) 2008, 2011 Renesas Solutions Corp.
> - * Copyright (c) 2008, 2011 Nobuhiro Iwamatsu
> + * Copyright (C) 2008 - 2012 Renesas Solutions Corp.
> + * Copyright (c) 2008 - 2012 Nobuhiro Iwamatsu
>   * Copyright (c) 2007 Carlos Munoz <carlos at kenati.com>
>   *
>   * This program is free software; you can redistribute it and/or modify
> @@ -25,6 +25,7 @@
>
>  #define SHETHER_NAME "sh_eth"
>
> +#if defined(CONFIG_SH)
>  /* Malloc returns addresses in the P1 area (cacheable). However we need to
>     use area P2 (non-cacheable) */
>  #define ADDR_TO_P2(addr)       ((((int)(addr) & ~0xe0000000) | 0xa0000000))
> @@ -35,6 +36,12 @@
>  #else
>  #define ADDR_TO_PHY(addr)      ((int)(addr) & ~0xe0000000)
>  #endif
> +#elif defined(CONFIG_ARM)
> +#define inl            readl
> +#define outl   writel
> +#define ADDR_TO_PHY(addr)      ((int)(addr))
> +#define ADDR_TO_P2(addr)       (addr)
> +#endif /* defined(CONFIG_SH) */
>
>  /* Number of supported ports */
>  #define MAX_PORT_NUM   2
> @@ -292,6 +299,9 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
>  #elif defined(CONFIG_CPU_SH7724)
>  #define SH_ETH_TYPE_ETHER
>  #define BASE_IO_ADDR   0xA4600000
> +#elif defined(CONFIG_R8A7740)
> +#define SH_ETH_TYPE_GETHER
> +#define BASE_IO_ADDR   0xE9A00000
>  #endif
>
>  /*
> --
> 1.7.10
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6