clocksource/drivers/timer-versatile: Clear OF_POPULATED flag
PATCH 1/1 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/[email protected]/
--- drivers/clocksource/timer-versatile.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clocksource/timer-versatile.c +3 -0
@@ -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 ;
Signature · 1 line
2.25.1.696.g5e7596f4ac-goog
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 7a3768c206a006525afc090f92d4d618d8356b92 Gitweb: https://git.kernel.org/tip/7a3768c206a006525afc090f92d4d618d8356b92 Author: Saravana Kannan <[email protected]> AuthorDate: Tue, 24 Mar 2020 12:53:02 -07:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Sat, 23 May 2020 00:03:25 +02:00
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/[email protected]/
--- drivers/clocksource/timer-versatile.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clocksource/timer-versatile.c +3 -0
@@ -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 ;