lkml.org 
[lkml]   [2019]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 80/89] stmmac: pci: Adjust IOT2000 matching
    Date
    From: Su Bao Cheng <baocheng.su@siemens.com>

    [ Upstream commit e0c1d14a1a3211dccf0540a6703ffbd5d2a75bdb ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
    @@ -159,6 +159,12 @@ static const struct dmi_system_id quark_
    },
    .driver_data = (void *)&galileo_stmmac_dmi_data,
    },
    + /*
    + * There are 2 types of SIMATIC IOT2000: IOT20202 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"),
    @@ -170,8 +176,6 @@ static const struct dmi_system_id quark_
    {
    .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,
    },

    \
     
     \ /
      Last update: 2019-04-30 13:52    [W:4.094 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site