From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Dec 2016 15:21:02 +0000 (-0500)
Subject: Merge branch 'hix5hd2_gmac-txsg-reset-clock-control'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e466af66c768a2a89f5359fdb330b93da799cc55;p=linux-beck.git

Merge branch 'hix5hd2_gmac-txsg-reset-clock-control'

Dongpo Li says:

====================
net: hix5hd2_gmac: add tx sg feature and reset/clock control signals

The "hix5hd2" is SoC name, add the generic ethernet driver compatible string.
The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
the SG/TXCSUM/TSO/UFO features.
This patch set only adds the SG(scatter-gather) driver for transmitting,
the drivers of other features will be submitted later.

Add the MAC reset control signals and clock signals.
We make these signals optional to be backward compatible with
the hix5hd2 SoC.

Changes in v2:
- Make the compatible string changes be a separate patch and
the most specific string come first than the generic string
as advised by Rob.
- Make the MAC reset control signals and clock signals optional
to be backward compatible with the hix5hd2 SoC.
- Change the compatible string and give the clock a specific name
in hix5hd2 dts file.
====================

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

e466af66c768a2a89f5359fdb330b93da799cc55