2023-04-12 06:52:40

by Tony Lindgren

[permalink] [raw]
Subject: [PATCH] clocksource/drivers/timer-ti-dm: Fix finding alwon timer

Clean-up commit b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use
of_address_to_resource()") caused a regression where pa is never set
making all related SoCs fail to boot. Let's fix this by setting pa
if found.

Fixes: b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use of_address_to_resource()")
Cc: Rob Herring <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
---
drivers/clocksource/timer-ti-dm-systimer.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c
--- a/drivers/clocksource/timer-ti-dm-systimer.c
+++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -261,8 +261,10 @@ static void __init dmtimer_systimer_assign_alwon(void)
if (of_address_to_resource(np, 0, &res))
continue;

+ pa = res.start;
+
/* Quirky omap3 boards must use dmtimer12 */
- if (quirk_unreliable_oscillator && res.start == 0x48318000)
+ if (quirk_unreliable_oscillator && pa == 0x48318000)
continue;

of_node_put(np);
--
2.40.0


2023-04-17 07:37:14

by Daniel Lezcano

[permalink] [raw]
Subject: Re: [PATCH] clocksource/drivers/timer-ti-dm: Fix finding alwon timer

On 12/04/2023 08:41, Tony Lindgren wrote:
> Clean-up commit b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use
> of_address_to_resource()") caused a regression where pa is never set
> making all related SoCs fail to boot. Let's fix this by setting pa
> if found.
>
> Fixes: b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use of_address_to_resource()")
> Cc: Rob Herring <[email protected]>
> Signed-off-by: Tony Lindgren <[email protected]>
> ---

Applied, thanks


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Subject: [tip: timers/core] clocksource/drivers/timer-ti-dm: Fix finding alwon timer

The following commit has been merged into the timers/core branch of tip:

Commit-ID: 8d7aac5153f21108365137b76e395dcf9bb3a800
Gitweb: https://git.kernel.org/tip/8d7aac5153f21108365137b76e395dcf9bb3a800
Author: Tony Lindgren <[email protected]>
AuthorDate: Wed, 12 Apr 2023 09:41:41 +03:00
Committer: Daniel Lezcano <[email protected]>
CommitterDate: Mon, 24 Apr 2023 16:56:14 +02:00

clocksource/drivers/timer-ti-dm: Fix finding alwon timer

Clean-up commit b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use
of_address_to_resource()") caused a regression where pa is never set
making all related SoCs fail to boot. Let's fix this by setting pa
if found.

Fixes: b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use of_address_to_resource()")
Cc: Rob Herring <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
drivers/clocksource/timer-ti-dm-systimer.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c
index 3b98a3c..4fa68f6 100644
--- a/drivers/clocksource/timer-ti-dm-systimer.c
+++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -261,8 +261,10 @@ static void __init dmtimer_systimer_assign_alwon(void)
if (of_address_to_resource(np, 0, &res))
continue;

+ pa = res.start;
+
/* Quirky omap3 boards must use dmtimer12 */
- if (quirk_unreliable_oscillator && res.start == 0x48318000)
+ if (quirk_unreliable_oscillator && pa == 0x48318000)
continue;

of_node_put(np);