summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-03-28 11:20:36 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-03-28 11:25:44 +0100
commit4479730e9263befbb9ce9563a09563db2acb8f7c (patch)
treee429e40fd6e2477aa785853e2a550788d702a7b1
parentca214e2c1793058e3a1387f9e343cc5b1731db15 (diff)
Revert "clocksource/drivers/timer-probe: Avoid creating dead devices"timers-core-2020-03-30
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
-rw-r--r--drivers/clocksource/timer-probe.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c
index a10f28d750a9..ee9574da53c0 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);