Skip to content
Commit 1a795da7 authored by David S. Miller's avatar David S. Miller
Browse files

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



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: default avatarDavid S. Miller <davem@davemloft.net>
parents 60d79ab3 d63439f5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment