diff options
| author | Jianguo Zhang <jianguo.zhang@mediatek.com> | 2022-09-29 09:47:58 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-09-30 13:04:23 +0100 |
| commit | 83936ea8d8ad22d094172e35cc36ec80d4ddfa96 (patch) | |
| tree | e6d16cbdbe642ca969046f3a85d416d0aa744b96 /drivers/net/ethernet/stmicro | |
| parent | 7871785ce92d689b2aaa430ebc488fffa94620b0 (diff) | |
| download | linux-83936ea8d8ad22d094172e35cc36ec80d4ddfa96.tar.bz2 | |
net: stmmac: add a parse for new property 'snps,clk-csr'
Parse new property 'snps,clk-csr' firstly because the new property
is documented in binding file, if failed, fall back to old property
'clk_csr' for legacy case
Signed-off-by: Jianguo Zhang <jianguo.zhang@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index b0b09c77711d..50f6b4a14be4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -444,7 +444,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) * or get clk_csr from device tree. */ plat->clk_csr = -1; - of_property_read_u32(np, "clk_csr", &plat->clk_csr); + if (of_property_read_u32(np, "snps,clk-csr", &plat->clk_csr)) + of_property_read_u32(np, "clk_csr", &plat->clk_csr); /* "snps,phy-addr" is not a standard property. Mark it as deprecated * and warn of its use. Remove this when phy node support is added. |