234eadd07e
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Thomas Richard <thomas.richard@bootlin.com> Link: https://github.com/openwrt/openwrt/pull/18740 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From f8dbe58e2f1a3c091531b3f8ef86b393ceee67d1 Mon Sep 17 00:00:00 2001
|
|
From: Christophe Roullier <christophe.roullier@foss.st.com>
|
|
Date: Mon, 1 Jul 2024 08:48:38 +0200
|
|
Subject: [PATCH] net: stmmac: dwmac-stm32: update err status in case different
|
|
of stm32mp13
|
|
|
|
The mask parameter of syscfg property is mandatory for MP13 but
|
|
optional for all other cases.
|
|
The function should not return error code because for non-MP13
|
|
the missing syscfg phandle in DT is not considered an error.
|
|
So reset err to 0 in that case to support existing DTs without
|
|
syscfg phandle.
|
|
|
|
Fixes: 50bbc0393114 ("net: stmmac: dwmac-stm32: add management of stm32mp13 for stm32")
|
|
Signed-off-by: Christophe Roullier <christophe.roullier@foss.st.com>
|
|
Reviewed-by: Marek Vasut <marex@denx.de>
|
|
Tested-by: Mark Brown <broonie@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
|
|
@@ -371,10 +371,12 @@ static int stm32_dwmac_parse_data(struct
|
|
dwmac->mode_mask = SYSCFG_MP1_ETH_MASK;
|
|
err = of_property_read_u32_index(np, "st,syscon", 2, &dwmac->mode_mask);
|
|
if (err) {
|
|
- if (dwmac->ops->is_mp13)
|
|
+ if (dwmac->ops->is_mp13) {
|
|
dev_err(dev, "Sysconfig register mask must be set (%d)\n", err);
|
|
- else
|
|
+ } else {
|
|
dev_dbg(dev, "Warning sysconfig register mask not set\n");
|
|
+ err = 0;
|
|
+ }
|
|
}
|
|
|
|
return err;
|