The following commit has been merged into the timers/core branch of tip: Commit-ID: 8fdb44176928fb3ef3e10d97eaf1aed82c90bd58 Gitweb: https://git.kernel.org/tip/8fdb44176928fb3ef3e10d97eaf1aed82c90bd58 Author: Arnd Bergmann <a...@arndb.de> AuthorDate: Wed, 20 Jan 2021 14:15:57 +01:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Wed, 03 Feb 2021 09:11:35 +01:00
clocksource/drivers/tango: Remove tango driver The tango platform is getting removed, so the driver is no longer needed. Cc: Marc Gonzalez <marc.w.gonza...@free.fr> Cc: Mans Rullgard <m...@mansr.com> Signed-off-by: Arnd Bergmann <a...@arndb.de> Acked-by: Mans Rullgard <m...@mansr.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Link: https://lore.kernel.org/r/20210120131559.1971359-3-a...@kernel.org --- drivers/clocksource/Kconfig | 8 +---- drivers/clocksource/Makefile | 1 +- drivers/clocksource/timer-tango-xtal.c | 57 +------------------------- 3 files changed, 66 deletions(-) delete mode 100644 drivers/clocksource/timer-tango-xtal.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index b26bb9e..b5250e4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -551,14 +551,6 @@ config CLKSRC_MIPS_GIC select CLOCKSOURCE_WATCHDOG select TIMER_OF -config CLKSRC_TANGO_XTAL - bool "Clocksource for Tango SoC" if COMPILE_TEST - depends on ARM - select TIMER_OF - select CLKSRC_MMIO - help - This enables the clocksource for Tango SoC. - config CLKSRC_PXA bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST depends on HAS_IOMEM diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index ce8a3c0..1b05f03 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -71,7 +71,6 @@ obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += timer-versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o -obj-$(CONFIG_CLKSRC_TANGO_XTAL) += timer-tango-xtal.o obj-$(CONFIG_CLKSRC_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLKSRC_IMX_TPM) += timer-imx-tpm.o obj-$(CONFIG_TIMER_IMX_SYS_CTR) += timer-imx-sysctr.o diff --git a/drivers/clocksource/timer-tango-xtal.c b/drivers/clocksource/timer-tango-xtal.c deleted file mode 100644 index 3f94e45..0000000 --- a/drivers/clocksource/timer-tango-xtal.c +++ /dev/null @@ -1,57 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <linux/clocksource.h> -#include <linux/sched_clock.h> -#include <linux/of_address.h> -#include <linux/printk.h> -#include <linux/delay.h> -#include <linux/init.h> -#include <linux/clk.h> - -static void __iomem *xtal_in_cnt; -static struct delay_timer delay_timer; - -static unsigned long notrace read_xtal_counter(void) -{ - return readl_relaxed(xtal_in_cnt); -} - -static u64 notrace read_sched_clock(void) -{ - return read_xtal_counter(); -} - -static int __init tango_clocksource_init(struct device_node *np) -{ - struct clk *clk; - int xtal_freq, ret; - - xtal_in_cnt = of_iomap(np, 0); - if (xtal_in_cnt == NULL) { - pr_err("%pOF: invalid address\n", np); - return -ENXIO; - } - - clk = of_clk_get(np, 0); - if (IS_ERR(clk)) { - pr_err("%pOF: invalid clock\n", np); - return PTR_ERR(clk); - } - - xtal_freq = clk_get_rate(clk); - delay_timer.freq = xtal_freq; - delay_timer.read_current_timer = read_xtal_counter; - - ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, - 32, clocksource_mmio_readl_up); - if (ret) { - pr_err("%pOF: registration failed\n", np); - return ret; - } - - sched_clock_register(read_sched_clock, 32, xtal_freq); - register_current_timer_delay(&delay_timer); - - return 0; -} - -TIMER_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init);
