diff mbox series

timer: mtk: skip setting parent with dummy fixed-clock

Message ID 20240706161303.9110-1-ansuelsmth@gmail.com
State Accepted
Commit 0f02269b76bc25a7c9332ae8630ba407cb62f9ec
Delegated to: Tom Rini
Headers show
Series timer: mtk: skip setting parent with dummy fixed-clock | expand

Commit Message

Christian Marangi July 6, 2024, 4:13 p.m. UTC
Skip setting parent with dummy fixed-clock. Upstream linux might declare
an additional clock for the mtk timer and that additional clock might
also be a fixed-clock defined in DT. Setting parent of a dummy fixed-clock
resulta in error hence mtk timer fails to probe.

Skip setting parent to permit correct probe of the mtk timer.

Fixes: d3c3606c5cc6 ("timer: MediaTek: add timer driver for MediaTek SoCs")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 drivers/timer/mtk_timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tom Rini July 18, 2024, 1:41 p.m. UTC | #1
On Sat, 06 Jul 2024 18:13:02 +0200, Christian Marangi wrote:

> Skip setting parent with dummy fixed-clock. Upstream linux might declare
> an additional clock for the mtk timer and that additional clock might
> also be a fixed-clock defined in DT. Setting parent of a dummy fixed-clock
> resulta in error hence mtk timer fails to probe.
> 
> Skip setting parent to permit correct probe of the mtk timer.
> 
> [...]

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 8216c289837..06deb23eb99 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -73,7 +73,8 @@  static int mtk_timer_probe(struct udevice *dev)
 		return ret;
 
 	ret = clk_get_by_index(dev, 1, &parent);
-	if (!ret) {
+	/* Skip setting the parent with dummy fixed-clock */
+	if (!ret && parent.dev->driver != DM_DRIVER_GET(fixed_clock)) {
 		ret = clk_set_parent(&clk, &parent);
 		if (ret)
 			return ret;