From: David S. Miller <davem@davemloft.net>
Date: Fri, 26 Sep 2014 04:13:06 +0000 (-0400)
Subject: Merge branch 'stmmac'
X-Git-Tag: v3.18-rc1~52^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2fdbfea5735d3deb30a8782c57f7210cb034e69d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stmmac'

Beniamino Galvani says:

====================
net: stmmac glue layer for Amlogic Meson SoCs

the Ethernet controller available in Amlogic Meson6 and Meson8 SoCs is
a Synopsys DesignWare MAC IP core, already supported by the stmmac
driver.

These patches add a glue layer to the driver for the platform-specific
settings required by the Amlogic variant.

This has been tested on a Amlogic S802 device with the initial Meson
support submitted by Carlo Caione [1].

[1] http://lwn.net/Articles/612000/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

2fdbfea5735d3deb30a8782c57f7210cb034e69d