mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
7a3768c206
The commit4f41fe386a("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:4f41fe386a("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
40 lines
866 B
C
40 lines
866 B
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
*
|
|
* Copyright (C) 2014 ARM Limited
|
|
*/
|
|
|
|
#include <linux/clocksource.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/sched_clock.h>
|
|
|
|
#define SYS_24MHZ 0x05c
|
|
|
|
static void __iomem *versatile_sys_24mhz;
|
|
|
|
static u64 notrace versatile_sys_24mhz_read(void)
|
|
{
|
|
return readl(versatile_sys_24mhz);
|
|
}
|
|
|
|
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;
|
|
|
|
versatile_sys_24mhz = base + SYS_24MHZ;
|
|
|
|
sched_clock_register(versatile_sys_24mhz_read, 32, 24000000);
|
|
|
|
return 0;
|
|
}
|
|
TIMER_OF_DECLARE(vexpress, "arm,vexpress-sysreg",
|
|
versatile_sched_clock_init);
|
|
TIMER_OF_DECLARE(versatile, "arm,versatile-sysreg",
|
|
versatile_sched_clock_init);
|