diff options
| author | Saravana Kannan <saravanak@google.com> | 2020-03-24 12:53:02 -0700 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 00:03:25 +0200 |
| commit | 7a3768c206a006525afc090f92d4d618d8356b92 (patch) | |
| tree | 0984b01e1b5a2f1505cca7320505a4e10bd1571d /drivers/clocksource | |
| parent | 7d7de1a65349811b24971c5e8e040e6aac192dd4 (diff) | |
| download | linux-stable-7a3768c206a006525afc090f92d4d618d8356b92.tar.gz linux-stable-7a3768c206a006525afc090f92d4d618d8356b92.tar.bz2 linux-stable-7a3768c206a006525afc090f92d4d618d8356b92.zip | |
clocksource/drivers/timer-versatile: Clear OF_POPULATED flag
The commit 4f41fe386a94 ("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/20200324175955.GA16972@arm.com/
Fixes: 4f41fe386a94 ("clocksource/drivers/timer-probe: Avoid creating dead devices")
Signed-off-by: Saravana Kannan <saravanak@google.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200324195302.203115-1-saravanak@google.com
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-versatile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-versatile.c b/drivers/clocksource/timer-versatile.c index e4ebb656d005..f5d017b31afa 100644 --- a/drivers/clocksource/timer-versatile.c +++ b/drivers/clocksource/timer-versatile.c @@ -6,6 +6,7 @@ #include <linux/clocksource.h> #include <linux/io.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/sched_clock.h> @@ -22,6 +23,8 @@ static int __init versatile_sched_clock_init(struct device_node *node) { void __iomem *base = of_iomap(node, 0); + of_node_clear_flag(node, OF_POPULATED); + if (!base) return -ENXIO; |