Messages in this thread Patch in this message | | | Date | Sat, 28 Mar 2020 10:30:58 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: timers/core] Revert "clocksource/drivers/timer-probe: Avoid creating dead devices" |
| |
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 4479730e9263befbb9ce9563a09563db2acb8f7c Gitweb: https://git.kernel.org/tip/4479730e9263befbb9ce9563a09563db2acb8f7c Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Sat, 28 Mar 2020 11:20:36 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Sat, 28 Mar 2020 11:25:44 +01:00
Revert "clocksource/drivers/timer-probe: Avoid creating dead devices"
This reverts commit 4f41fe386a94639cd9a1831298d4f85db5662f1e.
The change breaks systems on which the DT node of a device is used by multiple drivers. The proposed workaround to clear OF_POPULATED is just a band aid and this needs to be cleaned up at the root of the problem.
Revert this for now.
Reported-by: Ionela Voinescu <ionela.voinescu@arm.com> Reported-by: Jon Hunter <jonathanh@nvidia.com> Requested-by: Rob Herring <robh+dt@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Saravana Kannan <saravanak@google.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200324175955.GA16972@arm.com --- drivers/clocksource/timer-probe.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c index a10f28d..ee9574d 100644 --- a/drivers/clocksource/timer-probe.c +++ b/drivers/clocksource/timer-probe.c @@ -27,10 +27,8 @@ void __init timer_probe(void) init_func_ret = match->data; - of_node_set_flag(np, OF_POPULATED); ret = init_func_ret(np); if (ret) { - of_node_clear_flag(np, OF_POPULATED); if (ret != -EPROBE_DEFER) pr_err("Failed to initialize '%pOF': %d\n", np, ret);
| |