| From dd78efb39df662790974e364e88b316c1781b6c0 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sun, 8 Dec 2013 02:59:18 +0300 |
| Subject: sh_eth: add R8A7791 support |
| |
| Add support for yet another ARM member of the R-Car family, R-Car M2, also known |
| as R8A7791 -- it will share the code and data with previously added R8A7790. |
| Despite the Ether devices in these SoCs are indistinguishable at least from the |
| driver's point of view, we do introduce a new platform device ID "r8a7791-ether" |
| unlike the wildcard ID used for R8A7778/9 SoCs, due to newly established policy |
| for the Renesas SoCs. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 94a12b15e4c575e0aa0ba5e24a4f213163a823d0) |
| (Queued by David Miller for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/Kconfig | 2 +- |
| drivers/net/ethernet/renesas/sh_eth.c | 7 ++++--- |
| 2 files changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig |
| index c299e7f07660..3bff114d3ef4 100644 |
| --- a/drivers/net/ethernet/renesas/Kconfig |
| +++ b/drivers/net/ethernet/renesas/Kconfig |
| @@ -14,4 +14,4 @@ config SH_ETH |
| Renesas SuperH Ethernet device driver. |
| This driver supporting CPUs are: |
| - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757, |
| - R8A7740, R8A777x and R8A7790. |
| + R8A7740, R8A777x and R8A779x. |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index be9b6ab11c94..7f6dc6d8642e 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -395,8 +395,8 @@ static struct sh_eth_cpu_data r8a777x_data = { |
| .hw_swap = 1, |
| }; |
| |
| -/* R8A7790 */ |
| -static struct sh_eth_cpu_data r8a7790_data = { |
| +/* R8A7790/1 */ |
| +static struct sh_eth_cpu_data r8a779x_data = { |
| .set_duplex = sh_eth_set_duplex, |
| .set_rate = sh_eth_set_rate_r8a777x, |
| |
| @@ -2811,7 +2811,8 @@ static struct platform_device_id sh_eth_id_table[] = { |
| { "sh7763-gether", (kernel_ulong_t)&sh7763_data }, |
| { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, |
| { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data }, |
| - { "r8a7790-ether", (kernel_ulong_t)&r8a7790_data }, |
| + { "r8a7790-ether", (kernel_ulong_t)&r8a779x_data }, |
| + { "r8a7791-ether", (kernel_ulong_t)&r8a779x_data }, |
| { } |
| }; |
| MODULE_DEVICE_TABLE(platform, sh_eth_id_table); |
| -- |
| 1.8.5.rc3 |
| |
