On Mon, 2017-05-22 at 14:49 +0200, Jan Kiszka wrote: > On 2017-05-22 13:33, Joe Perches wrote: > > On Mon, 2017-05-22 at 13:12 +0200, Jan Kiszka wrote: > > > Avoids reimplementation of DMI matching in stmmac_pci_find_phy_addr. > > > > [] > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c > > > b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c > > > > [] > > > @@ -31,65 +31,78 @@ > > > > [] > > > +static const struct stmmac_pci_dmi_data iot2040_stmmac_dmi_data[] = { > > > { > > > - .name = "GalileoGen2", > > > .func = 6, > > > .phy_addr = 1, > > > }, > > > { > > > - .name = "SIMATIC IOT2000", > > > - .asset_tag = "6ES7647-0AA00-0YA2", > > > - .func = 6, > > > + .func = 7, > > > > Why change this from 6 to 7? > > > > The diff is confusing here: If you look at the outcome, we now have > galileo_stmmac_dmi_data with function 6 only (also used for the > IOT2020), and iot2040_stmmac_dmi_data with both function 6 and 7 (both > MACs are wired up).
Right. Apologies for noise.