| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- From e3ba8c4f83c6c206a20e4645a37612b1e10580c6 Mon Sep 17 00:00:00 2001
- From: Su Bao Cheng <baocheng.su@siemens.com>
- Date: Fri, 12 Oct 2018 15:08:11 +0200
- Subject: [PATCH 06/18] stmmac: pci: Adjust IOT2000 matching
- Since there are more IOT2040 variants with identical hardware but
- different asset tags, the asset tag matching should be adjusted to
- support them.
- For the board name "SIMATIC IOT2000", currently there are 2 types of
- hardware, IOT2020 and IOT2040. The IOT2020 is identified by its unique
- asset tag. Match on it first. If we then match on the board name only,
- we will catch all IOT2040 variants. In the future there will be no other
- devices with the "SIMATIC IOT2000" DMI board name but different
- hardware.
- Signed-off-by: Su Bao Cheng <baocheng.su@siemens.com>
- Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
- ---
- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
- index 279a1355d75f..ac733d4d3ed4 100644
- --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
- +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
- @@ -149,11 +149,15 @@ static const struct dmi_system_id quark_pci_dmi[] = {
- },
- .driver_data = (void *)&galileo_stmmac_dmi_data,
- },
- + /*
- + * There are 2 types of SIMATIC IOT2000: IOT2020 and IOT2040.
- + * The asset tag "6ES7647-0AA00-0YA2" is only for IOT2020 which
- + * has only one pci network device while other asset tags are
- + * for IOT2040 which has two.
- + */
- {
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"),
- - DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG,
- - "6ES7647-0AA00-1YA2"),
- },
- .driver_data = (void *)&iot2040_stmmac_dmi_data,
- },
- --
- 2.16.4
|
