diff options
author | David S. Miller <davem@davemloft.net> | 2016-12-10 04:11:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-10 04:11:15 +0100 |
commit | d96dac145492ff54e32967dc486e2a90e51664ea (patch) | |
tree | d35ca8c893f3e1af1618ba7acbb9abe91863dd77 /net | |
parent | net: xgene: avoid bogus maybe-uninitialized warning (diff) | |
parent | net: qcom/emac: add support for the Qualcomm Technologies QDF2400 (diff) | |
download | linux-d96dac145492ff54e32967dc486e2a90e51664ea.tar.xz linux-d96dac145492ff54e32967dc486e2a90e51664ea.zip |
Merge branch 'qcom-emac'
Timur Tabi says:
====================
net: qcom/emac: simplify support for different SOCs
On SOCs that have the Qualcomm EMAC network controller, the internal
PHY block is always different. Sometimes the differences are small,
sometimes it might be a completely different IP. Either way, using version
numbers to differentiate them and putting all of the init code in one
file does not scale.
This patchset does two things: The first breaks up the current code into
different files, and the second patch adds support for a third SOC, the
Qualcomm Technologies QDF2400 ARM Server SOC.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions