| Message ID | 20211206162323.29281-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1,1/4] can: hi311x: Use devm_clk_get_optional() to get the input clock | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject, async |
On Mon, Dec 06, 2021 at 06:23:21PM +0200, Andy Shevchenko wrote: > In some configurations, mainly ACPI-based, the clock frequency of the > device is supplied by very well established 'clock-frequency' > property. Hence, try to get it from the property at last if no other > providers are available. Sorry, this shouldn't be like this. Wrongly rebased version. I will redo v2.
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 13fb979645cf..1e4ff904be0f 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -828,19 +828,26 @@ MODULE_DEVICE_TABLE(spi, hi3110_id_table); static int hi3110_can_probe(struct spi_device *spi) { - const struct of_device_id *of_id = of_match_device(hi3110_of_match, - &spi->dev); + struct device *dev = &spi->dev; struct net_device *net; struct hi3110_priv *priv; struct clk *clk; - int freq, ret; + u32 freq; + int ret; clk = devm_clk_get_optional(&spi->dev, NULL); if (IS_ERR(clk)) { dev_err(&spi->dev, "no CAN clock source defined\n"); return PTR_ERR(clk); } - freq = clk_get_rate(clk); + + if (clk) { + freq = clk_get_rate(clk); + } else { + ret = device_property_read_u32(dev, "clock-frequency", &freq); + if (ret) + return dev_err_probe(dev, ret, "Failed to get clock-frequency!\n"); + } /* Sanity check */ if (freq > 40000000)
In some configurations, mainly ACPI-based, the clock frequency of the device is supplied by very well established 'clock-frequency' property. Hence, try to get it from the property at last if no other providers are available. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/net/can/spi/hi311x.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)