Merge branch 'stmmac-Add-additional-EHL-PCI-info-and-PCI-ID'

Browse source

Voon Weifeng says:

====================
stmmac: Add additional EHL PCI info and PCI ID

Thanks Jose Miguel Abreu for the feedback. Summary of v2 patches:

1/3: As suggested to keep the stmmac_pci.c file simple. So created a new
     file dwmac-intel.c and moved all the Intel specific PCI device out
     of stmmac_pci.c.

2/3: Added Intel(R) Programmable Services Engine (Intel(R) PSE) MAC PCI ID
     and PCI info

3/3: Added EHL 2.5Gbps PCI ID and info

Changes from v1:
-Added a patch to move all Intel specific PCI device from stmmac_pci.c to
 a new file named dwmac-intel.c.
-Combine v1 patch 1/3 and 2/3 into single patch.
====================

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

...

This commit is contained in:

David S. Miller 2020-03-30 20:10:34 -07:00

parent 60d79ab33c d63439f575

commit 1a795da798

4 changed files with 602 additions and 313 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/net/ethernet/stmicro/stmmac/Kconfig

View file

1

drivers/net/ethernet/stmicro/stmmac/Makefile

View file

592

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

View file

313

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

View file