| Message ID | 20250216123953.1252523-3-inochiama@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | riscv: sophgo: Add ethernet support for SG2044 | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | success | Success |
| bjorn/build-rv32-defconfig | success | build-rv32-defconfig |
| bjorn/build-rv64-clang-allmodconfig | success | build-rv64-clang-allmodconfig |
| bjorn/build-rv64-gcc-allmodconfig | success | build-rv64-gcc-allmodconfig |
| bjorn/build-rv64-nommu-k210-defconfig | success | build-rv64-nommu-k210-defconfig |
| bjorn/build-rv64-nommu-k210-virt | success | build-rv64-nommu-k210-virt |
| bjorn/checkpatch | success | checkpatch |
| bjorn/dtb-warn-rv64 | success | dtb-warn-rv64 |
| bjorn/header-inline | success | header-inline |
| bjorn/kdoc | success | kdoc |
| bjorn/module-param | success | module-param |
| bjorn/verify-fixes | success | verify-fixes |
| bjorn/verify-signedoff | success | verify-signedoff |
On Sun, Feb 16, 2025 at 08:39:50PM +0800, 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> > Reviewed-by: Romain Gantois <romain.gantois@bootlin.com> Ideally, this would be two patches, one adding the stmmac_gmac4_compats[] with the existing compatibles, and then a patch adding snps,dwmac-5.30a. Logically, these are different, so two patches. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Sun, Feb 16, 2025 at 05:59:31PM +0100, Andrew Lunn wrote: > On Sun, Feb 16, 2025 at 08:39:50PM +0800, 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> > > Reviewed-by: Romain Gantois <romain.gantois@bootlin.com> > > Ideally, this would be two patches, one adding the > stmmac_gmac4_compats[] with the existing compatibles, and then a patch > adding snps,dwmac-5.30a. Logically, these are different, so two > patches. > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Andrew > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Andrew I will separate them and apply the tag, thanks for reviewing. Regards, Inochi
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;