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>

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 9d8320edea536e7ee87f1a069cdfa8d90b7182f4..8cfc4a54f2dc69240ae1fc42195ef854e0b1c2c9 100644 (file)
--- 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>
 
@@ -988,6 +989,11 @@ static void ravb_adjust_link(struct net_device *ndev)
                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)
 {
@@ -1023,10 +1029,10 @@ static int ravb_phy_init(struct net_device *ndev)
                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");