| Message ID | 20250209013054.816580-3-inochiama@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | riscv: sophgo: Add ethernet support for SG2044 | expand |
On dimanche 9 février 2025 02:30:51 heure normale d’Europe centrale Inochi Amaoto wrote: > Add "snps,dwmac-5.30a" compatible string for 5.30a version that can avoid > to define some platform data in the glue layer. > > Signed-off-by: Inochi Amaoto <inochiama@gmail.com> > --- > .../ethernet/stmicro/stmmac/stmmac_platform.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index > d0e61aa1a495..8dc3bd6946c6 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > @@ -405,6 +405,17 @@ static int stmmac_of_get_mac_mode(struct device_node > *np) return -ENODEV; > } > > +/* Compatible string array for all gmac4 devices */ > +static const char * const stmmac_gmac4_compats[] = { > + "snps,dwmac-4.00", > + "snps,dwmac-4.10a", > + "snps,dwmac-4.20a", > + "snps,dwmac-5.10a", > + "snps,dwmac-5.20", > + "snps,dwmac-5.30a", > + NULL > +}; > + > /** > * stmmac_probe_config_dt - parse device-tree driver parameters > * @pdev: platform_device structure > @@ -538,11 +549,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 > *mac) plat->pmt = 1; > } > > - if (of_device_is_compatible(np, "snps,dwmac-4.00") || > - of_device_is_compatible(np, "snps,dwmac-4.10a") || > - of_device_is_compatible(np, "snps,dwmac-4.20a") || > - of_device_is_compatible(np, "snps,dwmac-5.10a") || > - of_device_is_compatible(np, "snps,dwmac-5.20")) { > + if (of_device_compatible_match(np, stmmac_gmac4_compats)) { > plat->has_gmac4 = 1; > plat->has_gmac = 0; > plat->pmt = 1; LGTM Reviewed-by: Romain Gantois <romain.gantois@bootlin.com>
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index d0e61aa1a495..8dc3bd6946c6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -405,6 +405,17 @@ static int stmmac_of_get_mac_mode(struct device_node *np) return -ENODEV; } +/* Compatible string array for all gmac4 devices */ +static const char * const stmmac_gmac4_compats[] = { + "snps,dwmac-4.00", + "snps,dwmac-4.10a", + "snps,dwmac-4.20a", + "snps,dwmac-5.10a", + "snps,dwmac-5.20", + "snps,dwmac-5.30a", + NULL +}; + /** * stmmac_probe_config_dt - parse device-tree driver parameters * @pdev: platform_device structure @@ -538,11 +549,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) plat->pmt = 1; } - if (of_device_is_compatible(np, "snps,dwmac-4.00") || - of_device_is_compatible(np, "snps,dwmac-4.10a") || - of_device_is_compatible(np, "snps,dwmac-4.20a") || - of_device_is_compatible(np, "snps,dwmac-5.10a") || - of_device_is_compatible(np, "snps,dwmac-5.20")) { + if (of_device_compatible_match(np, stmmac_gmac4_compats)) { plat->has_gmac4 = 1; plat->has_gmac = 0; plat->pmt = 1;
Add "snps,dwmac-5.30a" compatible string for 5.30a version that can avoid to define some platform data in the glue layer. Signed-off-by: Inochi Amaoto <inochiama@gmail.com> --- .../ethernet/stmicro/stmmac/stmmac_platform.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)