| From 857f329237b380fa7b69cb29952c17a451393aaf Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 27 Jan 2017 20:46:27 +0100 |
| Subject: [PATCH 218/255] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W |
| |
| The limitation to 10/100Mbit speeds on R-Car Gen3 is valid for R-Car H3 |
| ES1.0 only. Check for the exact SoC model to allow 1Gbps on newer |
| revisions of R-Car H3, and on R-Car M3-W. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 0e98f9d5f0b4a9012bd4fb5ff88b3ea290deb6a8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/ravb_main.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/renesas/ravb_main.c |
| +++ b/drivers/net/ethernet/renesas/ravb_main.c |
| @@ -31,6 +31,7 @@ |
| #include <linux/pm_runtime.h> |
| #include <linux/slab.h> |
| #include <linux/spinlock.h> |
| +#include <linux/sys_soc.h> |
| |
| #include <asm/div64.h> |
| |
| @@ -998,6 +999,11 @@ static void ravb_adjust_link(struct net_ |
| phy_print_status(phydev); |
| } |
| |
| +static const struct soc_device_attribute r8a7795es10[] = { |
| + { .soc_id = "r8a7795", .revision = "ES1.0", }, |
| + { /* sentinel */ } |
| +}; |
| + |
| /* PHY init function */ |
| static int ravb_phy_init(struct net_device *ndev) |
| { |
| @@ -1033,10 +1039,10 @@ static int ravb_phy_init(struct net_devi |
| goto err_deregister_fixed_link; |
| } |
| |
| - /* This driver only support 10/100Mbit speeds on Gen3 |
| + /* This driver only support 10/100Mbit speeds on R-Car H3 ES1.0 |
| * at this time. |
| */ |
| - if (priv->chip_id == RCAR_GEN3) { |
| + if (soc_device_match(r8a7795es10)) { |
| err = phy_set_max_speed(phydev, SPEED_100); |
| if (err) { |
| netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n"); |
