[GIT PULL] Renesas ARM Based SoC EtherAVB Updates for v4.10

[GIT PULL] Renesas ARM Based SoC EtherAVB Updates for v4.10

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC EtherAVB updates for v4.10.

This pull request is based on the "Second Round of Renesas ARM64 Based SoC
DT Updates for v4.10", tagged as arm64-dt-for-v4.10, which I have also sent
a pull-request for.

The reason for this base is to provide dependencies. For the same reason
an ack has been provided by David Miller to facilitate a merge of the patch
via the Renesas tree.


The following changes since commit 6f8a4c84d95031806594f5992a79fefd251c2f51:

  arm64: dts: r8a7796: Add device node for PRR (2016-11-17 14:48:28 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-ravb-for-v4.10

for you to fetch changes up to 735ea633e42060546cabe8430efbc00d4be1790a:

  ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W (2016-11-17 14:53:44 +0100)

----------------------------------------------------------------
Renesas ARM Based SoC EtherAVB Updates for v4.10

* Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W

 drivers/net/ethernet/renesas/ravb_main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

[PATCH] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

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>
Acked-by: David S. Miller <davem@davemloft.net>
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(-)

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 630536bc72f9..83c45edba6ef 100644
--- 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>
 
@@ -977,6 +978,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)
 {
@@ -1011,10 +1017,10 @@ static int ravb_phy_init(struct net_device *ndev)
 		return -ENOENT;
 	}
 
-	/* 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)) {
 		int err;
 
 		err = phy_set_max_speed(phydev, SPEED_100);
-- 
2.7.0.rc3.207.g0ac5344

[GIT PULL] Renesas ARM Based SoC EtherAVB Updates for v4.10

[Olof Johansson]

On Thu, Nov 17, 2016 at 03:05:08PM +0100, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these Renesas ARM based SoC EtherAVB updates for v4.10.
> 
> This pull request is based on the "Second Round of Renesas ARM64 Based SoC
> DT Updates for v4.10", tagged as arm64-dt-for-v4.10, which I have also sent
> a pull-request for.
> 
> The reason for this base is to provide dependencies. For the same reason
> an ack has been provided by David Miller to facilitate a merge of the patch
> via the Renesas tree.

And now we have cascading dependencies. Can't merge this either.

Why is the DT branch and this driver branch entangled?! Again, there is
absolutely no functional dependency between them.


-Olof

[GIT PULL] Renesas ARM Based SoC EtherAVB Updates for v4.10

[Simon Horman]

On Fri, Nov 18, 2016 at 05:43:27PM -0800, Olof Johansson wrote:
> On Thu, Nov 17, 2016 at 03:05:08PM +0100, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> > 
> > Please consider these Renesas ARM based SoC EtherAVB updates for v4.10.
> > 
> > This pull request is based on the "Second Round of Renesas ARM64 Based SoC
> > DT Updates for v4.10", tagged as arm64-dt-for-v4.10, which I have also sent
> > a pull-request for.
> > 
> > The reason for this base is to provide dependencies. For the same reason
> > an ack has been provided by David Miller to facilitate a merge of the patch
> > via the Renesas tree.
> 
> And now we have cascading dependencies. Can't merge this either.
> 
> Why is the DT branch and this driver branch entangled?! Again, there is
> absolutely no functional dependency between them.

Sorry once again. I would like to withdraw this pull request.