Re: [PATCH v1 2/7] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string

From: yanhong wang
Date: Thu Dec 08 2022 - 21:27:12 EST




On 2022/12/9 9:59, Ben Dooks wrote:
>
>
> On 2022-12-01 09:02, Yanhong Wang wrote:
>> Add "snps,dwmac-5.20" compatible string for 5.20 version that can avoid
>> to define some platform data in the glue layer.
>>
>> Signed-off-by: Emil Renner Berthing <kernel@xxxxxxxx>
>> Signed-off-by: Yanhong Wang <yanhong.wang@xxxxxxxxxxxxxxxx>
>> ---
>>  drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> index 50f6b4a14be4..cc3b701af802 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> @@ -519,7 +519,8 @@ stmmac_probe_config_dt(struct platform_device
>> *pdev, u8 *mac)
>>      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.10a") ||
>> +        of_device_is_compatible(np, "snps,dwmac-5.20")) {
>>          plat->has_gmac4 = 1;
>>          plat->has_gmac = 0;
>>          plat->pmt = 1;
>
> out of interest, is the version of the ip autodetectable yet?
> also, we would be better off if having an if (version > 4) check if we use the standard snps ip block code headers
>

Yes, the version of the ip is autodetectable. It is also possible to use the standard "snps, dwmac-5.10a" definition on JH7110(has been tested on the VisionFive v2 boards and works normally), do you have any better suggestions?