Skip to content

Commit 7a3768c

Browse files
Saravana Kannandlezcano
authored andcommitted
clocksource/drivers/timer-versatile: Clear OF_POPULATED flag
The commit 4f41fe3 ("clocksource/drivers/timer-probe: Avoid creating dead devices") broke the handling of arm,vexpress-sysreg [1]. The arm,vexpress-sysreg device is handled by both timer-versatile.c and drivers/mfd/vexpress-sysreg.c. While the timer driver doesn't use the device, the mfd driver still needs a device to probe. So, this patch clears the OF_POPULATED flag to continue creating the device. [1] - https://lore.kernel.org/lkml/[email protected]/ Fixes: 4f41fe3 ("clocksource/drivers/timer-probe: Avoid creating dead devices") Signed-off-by: Saravana Kannan <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7d7de1a commit 7a3768c

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/clocksource/timer-versatile.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/clocksource.h>
88
#include <linux/io.h>
9+
#include <linux/of.h>
910
#include <linux/of_address.h>
1011
#include <linux/sched_clock.h>
1112

@@ -22,6 +23,8 @@ static int __init versatile_sched_clock_init(struct device_node *node)
2223
{
2324
void __iomem *base = of_iomap(node, 0);
2425

26+
of_node_clear_flag(node, OF_POPULATED);
27+
2528
if (!base)
2629
return -ENXIO;
2730

0 commit comments

Comments
 (0)