From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
In order to drop the dependency on CONFIG_OF, convert all device property
getters from OF-specific to generic device properties and stop pulling
in any linux/of.h symbols.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 87c5bea6c2a243f3be998b2c3935bc1dc23bfe22..22d0eaab35eaffac0bca58f8625ecc5c955b6631 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -135,7 +135,7 @@ config DWMAC_MESON
config DWMAC_QCOM_ETHQOS
tristate "Qualcomm ETHQOS support"
default ARCH_QCOM
- depends on OF && (ARCH_QCOM || COMPILE_TEST)
+ depends on ARCH_QCOM || COMPILE_TEST
help
Support for the Qualcomm ETHQOS core.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 1a616a71c36ace29a74a0aa23fc8173443aa49a5..8578a2df8cf0d1d8808bcf7e7b57c93eb14c87db 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2018-19, Linaro Limited
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
-#include <linux/of.h>
#include <linux/of_net.h>
#include <linux/platform_device.h>
#include <linux/phy.h>
@@ -748,7 +748,6 @@ static void ethqos_ptp_clk_freq_config(struct stmmac_priv *priv)
static int qcom_ethqos_probe(struct platform_device *pdev)
{
- struct device_node *np = pdev->dev.of_node;
const struct ethqos_emac_driver_data *data;
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
@@ -799,7 +798,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ethqos->mac_base = stmmac_res.addr;
- data = of_device_get_match_data(dev);
+ data = device_get_match_data(dev);
ethqos->por = data->por;
ethqos->num_por = data->num_por;
ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en;
@@ -836,9 +835,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
if (ethqos->has_emac_ge_3)
plat_dat->dwmac4_addrs = &data->dwmac4_addrs;
plat_dat->pmt = 1;
- if (of_property_read_bool(np, "snps,tso"))
+ if (device_property_present(dev, "snps,tso"))
plat_dat->flags |= STMMAC_FLAG_TSO_EN;
- if (of_device_is_compatible(np, "qcom,qcs404-ethqos"))
+ if (device_is_compatible(dev, "qcom,qcs404-ethqos"))
plat_dat->flags |= STMMAC_FLAG_RX_CLK_RUNS_IN_LPI;
if (data->dma_addr_width)
plat_dat->host_dma_width = data->dma_addr_width;
--
2.51.0On 11/7/25 11:29 AM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > In order to drop the dependency on CONFIG_OF, convert all device property > getters from OF-specific to generic device properties and stop pulling > in any linux/of.h symbols. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > --- [...] > - if (of_property_read_bool(np, "snps,tso")) > + if (device_property_present(dev, "snps,tso")) This is a change in behavior - "snps,tso = <0>" would have previously returned false, it now returns true although it seems like it's the plat driver clunkily working around not including the common compatible and inlining parts of the common probe functions.. Konrad
On Fri, Nov 7, 2025 at 11:49 AM Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> wrote: > > On 11/7/25 11:29 AM, Bartosz Golaszewski wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > In order to drop the dependency on CONFIG_OF, convert all device property > > getters from OF-specific to generic device properties and stop pulling > > in any linux/of.h symbols. > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > --- > > [...] > > > - if (of_property_read_bool(np, "snps,tso")) > > + if (device_property_present(dev, "snps,tso")) > > This is a change in behavior - "snps,tso = <0>" would have previously > returned false, it now returns true > This property is a boolean flag, it cannot have a value. Bartosz > although it seems like it's the plat driver clunkily working around > not including the common compatible and inlining parts of the common > probe functions.. > > Konrad >
On 11/13/25 2:18 PM, Bartosz Golaszewski wrote: > On Fri, Nov 7, 2025 at 11:49 AM Konrad Dybcio > <konrad.dybcio@oss.qualcomm.com> wrote: >> >> On 11/7/25 11:29 AM, Bartosz Golaszewski wrote: >>> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> >>> >>> In order to drop the dependency on CONFIG_OF, convert all device property >>> getters from OF-specific to generic device properties and stop pulling >>> in any linux/of.h symbols. >>> >>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> >>> --- >> >> [...] >> >>> - if (of_property_read_bool(np, "snps,tso")) >>> + if (device_property_present(dev, "snps,tso")) >> >> This is a change in behavior - "snps,tso = <0>" would have previously >> returned false, it now returns true >> > > This property is a boolean flag, it cannot have a value. Every DT property may have a value, so this is not as obvious as we'd like it to be (IIUC - unless that changed recently) Konrad
On Thu, Nov 13, 2025 at 2:33 PM Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> wrote: > > On 11/13/25 2:18 PM, Bartosz Golaszewski wrote: > > On Fri, Nov 7, 2025 at 11:49 AM Konrad Dybcio > > <konrad.dybcio@oss.qualcomm.com> wrote: > >> > >> On 11/7/25 11:29 AM, Bartosz Golaszewski wrote: > >>> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > >>> > >>> In order to drop the dependency on CONFIG_OF, convert all device property > >>> getters from OF-specific to generic device properties and stop pulling > >>> in any linux/of.h symbols. > >>> > >>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > >>> --- > >> > >> [...] > >> > >>> - if (of_property_read_bool(np, "snps,tso")) > >>> + if (device_property_present(dev, "snps,tso")) > >> > >> This is a change in behavior - "snps,tso = <0>" would have previously > >> returned false, it now returns true > >> > > > > This property is a boolean flag, it cannot have a value. > > Every DT property may have a value, so this is not as obvious as we'd > like it to be (IIUC - unless that changed recently) > That's new to me. I thought that if a property is a /schemas/types.yaml#/definitions/flag then only its boolean form is allowed. The fact that the dtc can compile it with a value doesn't matter as the bindings are the higher authority for DT sources? I don't mind changing it to device_property_read_bool() but I'm not sure if we really should. Bartosz
On 11/13/25 2:41 PM, Bartosz Golaszewski wrote: > On Thu, Nov 13, 2025 at 2:33 PM Konrad Dybcio > <konrad.dybcio@oss.qualcomm.com> wrote: >> >> On 11/13/25 2:18 PM, Bartosz Golaszewski wrote: >>> On Fri, Nov 7, 2025 at 11:49 AM Konrad Dybcio >>> <konrad.dybcio@oss.qualcomm.com> wrote: >>>> >>>> On 11/7/25 11:29 AM, Bartosz Golaszewski wrote: >>>>> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> >>>>> >>>>> In order to drop the dependency on CONFIG_OF, convert all device property >>>>> getters from OF-specific to generic device properties and stop pulling >>>>> in any linux/of.h symbols. >>>>> >>>>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> >>>>> --- >>>> >>>> [...] >>>> >>>>> - if (of_property_read_bool(np, "snps,tso")) >>>>> + if (device_property_present(dev, "snps,tso")) >>>> >>>> This is a change in behavior - "snps,tso = <0>" would have previously >>>> returned false, it now returns true >>>> >>> >>> This property is a boolean flag, it cannot have a value. >> >> Every DT property may have a value, so this is not as obvious as we'd >> like it to be (IIUC - unless that changed recently) >> > > That's new to me. I thought that if a property is a > /schemas/types.yaml#/definitions/flag then only its boolean form is > allowed. The fact that the dtc can compile it with a value doesn't > matter as the bindings are the higher authority for DT sources? You're right, I misrepresented the issue. read_bool() was historically used for making sure a property is present and this was a problem when the type was != flag. Please discard my comment Konrad
© 2016 - 2025 Red Hat, Inc.