]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: stmmac: fix "snps,axi-config" node property parsing
authorJisheng Zhang <jszhang@kernel.org>
Fri, 2 Dec 2022 16:17:39 +0000 (00:17 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Dec 2022 10:30:46 +0000 (11:30 +0100)
[ Upstream commit 61d4f140943c47c1386ed89f7260e00418dfad9d ]

In dt-binding snps,dwmac.yaml, some properties under "snps,axi-config"
node are named without "axi_" prefix, but the driver expects the
prefix. Since the dt-binding has been there for a long time, we'd
better make driver match the binding for compatibility.

Fixes: 99942d2abc37 ("stmmac: rework DMA bus setting and introduce new platform AXI structure")
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20221202161739.2203-1-jszhang@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

index 70cbf48c2c038ab5ffed125a0f93ba78ac92b27a..a2ff9b4727ecdd44c57ed9c606e627391ad86c40 100644 (file)
@@ -107,10 +107,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
 
        axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");
        axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
-       axi->axi_kbbe = of_property_read_bool(np, "snps,axi_kbbe");
-       axi->axi_fb = of_property_read_bool(np, "snps,axi_fb");
-       axi->axi_mb = of_property_read_bool(np, "snps,axi_mb");
-       axi->axi_rb =  of_property_read_bool(np, "snps,axi_rb");
+       axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe");
+       axi->axi_fb = of_property_read_bool(np, "snps,fb");
+       axi->axi_mb = of_property_read_bool(np, "snps,mb");
+       axi->axi_rb =  of_property_read_bool(np, "snps,rb");
 
        if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt))
                axi->axi_wr_osr_lmt = 1;