forked from Minki/linux
ARM: versatile: Remove dead sched_clock code
Now that there's a DT based sched_clock driver in drivers/clocksource/timer-versatile.c and all the Arm reference platforms are DT only, the non-DT versatile sched_clock code can be removed. Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20200409221952.31287-1-robh@kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
65fd41e6fa
commit
db1e113578
@ -735,7 +735,6 @@ source "arch/arm/mach-ux500/Kconfig"
|
|||||||
source "arch/arm/mach-versatile/Kconfig"
|
source "arch/arm/mach-versatile/Kconfig"
|
||||||
|
|
||||||
source "arch/arm/mach-vexpress/Kconfig"
|
source "arch/arm/mach-vexpress/Kconfig"
|
||||||
source "arch/arm/plat-versatile/Kconfig"
|
|
||||||
|
|
||||||
source "arch/arm/mach-vt8500/Kconfig"
|
source "arch/arm/mach-vt8500/Kconfig"
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ menuconfig ARCH_REALVIEW
|
|||||||
select MACH_REALVIEW_EB if ARCH_MULTI_V5
|
select MACH_REALVIEW_EB if ARCH_MULTI_V5
|
||||||
select MFD_SYSCON
|
select MFD_SYSCON
|
||||||
select PLAT_VERSATILE
|
select PLAT_VERSATILE
|
||||||
select PLAT_VERSATILE_SCHED_CLOCK
|
|
||||||
select POWER_RESET
|
select POWER_RESET
|
||||||
select POWER_RESET_VERSATILE
|
select POWER_RESET_VERSATILE
|
||||||
select POWER_SUPPLY
|
select POWER_SUPPLY
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
if PLAT_VERSATILE
|
|
||||||
|
|
||||||
config PLAT_VERSATILE_SCHED_CLOCK
|
|
||||||
bool
|
|
||||||
|
|
||||||
endif
|
|
@ -1,6 +1,5 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
|
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
|
||||||
|
|
||||||
obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
|
|
||||||
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
||||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef ARM_PLAT_SCHED_CLOCK_H
|
|
||||||
#define ARM_PLAT_SCHED_CLOCK_H
|
|
||||||
|
|
||||||
void versatile_sched_clock_init(void __iomem *, unsigned long);
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,28 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/*
|
|
||||||
* linux/arch/arm/plat-versatile/sched-clock.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 1999 - 2003 ARM Limited
|
|
||||||
* Copyright (C) 2000 Deep Blue Solutions Ltd
|
|
||||||
*/
|
|
||||||
#include <linux/kernel.h>
|
|
||||||
#include <linux/io.h>
|
|
||||||
#include <linux/sched_clock.h>
|
|
||||||
|
|
||||||
#include <plat/sched_clock.h>
|
|
||||||
|
|
||||||
static void __iomem *ctr;
|
|
||||||
|
|
||||||
static u64 notrace versatile_read_sched_clock(void)
|
|
||||||
{
|
|
||||||
if (ctr)
|
|
||||||
return readl(ctr);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __init versatile_sched_clock_init(void __iomem *reg, unsigned long rate)
|
|
||||||
{
|
|
||||||
ctr = reg;
|
|
||||||
sched_clock_register(versatile_read_sched_clock, 32, rate);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user