ARM: versatile: Remove dead sched_clock code

Commit Message

Rob Herring (Arm) April 9, 2020, 10:19 p.m. UTC

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 <[e-mail]>
Signed-off-by: Rob Herring <[e-mail]>
---
 arch/arm/Kconfig                              |  1 -
 arch/arm/mach-realview/Kconfig                |  1 -
 arch/arm/plat-versatile/Kconfig               |  7 -----
 arch/arm/plat-versatile/Makefile              |  1 -
 .../plat-versatile/include/plat/sched_clock.h |  7 -----
 arch/arm/plat-versatile/sched-clock.c         | 28 -------------------
 6 files changed, 45 deletions(-)
 delete mode 100644 arch/arm/plat-versatile/Kconfig
 delete mode 100644 arch/arm/plat-versatile/include/plat/sched_clock.h
 delete mode 100644 arch/arm/plat-versatile/sched-clock.c

Comments

Linus Walleij April 16, 2020, 11:03 a.m. UTC | #1

On Fri, Apr 10, 2020 at 12:19 AM Rob Herring <[e-mail]> wrote:

> 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 <[e-mail]>
> Signed-off-by: Rob Herring <[e-mail]>

Awesome, good catch. Patch applied!

Yours,
Linus Walleij

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 66a04f6f4775..4595e5cd6602 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -735,7 +735,6 @@  source "arch/arm/mach-ux500/Kconfig"
 source "arch/arm/mach-versatile/Kconfig"
 
 source "arch/arm/mach-vexpress/Kconfig"
-source "arch/arm/plat-versatile/Kconfig"
 
 source "arch/arm/mach-vt8500/Kconfig"
 
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 44ebbf9ec673..e7633c0aaae7 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -16,7 +16,6 @@  menuconfig ARCH_REALVIEW
 	select MACH_REALVIEW_EB if ARCH_MULTI_V5
 	select MFD_SYSCON
 	select PLAT_VERSATILE
-	select PLAT_VERSATILE_SCHED_CLOCK
 	select POWER_RESET
 	select POWER_RESET_VERSATILE
 	select POWER_SUPPLY
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
deleted file mode 100644
index 748238f9f10e..000000000000
--- a/arch/arm/plat-versatile/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0-only
-if PLAT_VERSATILE
-
-config PLAT_VERSATILE_SCHED_CLOCK
-	bool
-
-endif
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index e856f0a4ac6e..5de44a57c4de 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,6 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 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_HOTPLUG_CPU)		+= hotplug.o
diff --git a/arch/arm/plat-versatile/include/plat/sched_clock.h b/arch/arm/plat-versatile/include/plat/sched_clock.h
deleted file mode 100644
index 83fdaef23c2e..000000000000
--- a/arch/arm/plat-versatile/include/plat/sched_clock.h
+++ /dev/null
@@ -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
diff --git a/arch/arm/plat-versatile/sched-clock.c b/arch/arm/plat-versatile/sched-clock.c
deleted file mode 100644
index ecb7913d2f53..000000000000
--- a/arch/arm/plat-versatile/sched-clock.c
+++ /dev/null
@@ -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);
-}