From: Arnd Bergmann <arnd@kernel.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Cc: Arnd Bergmann <arnd@arndb.de>, Marc Gonzalez <marc.w.gonzalez@free.fr>, Mans Rullgard <mans@mansr.com> Subject: [PATCH 2/4] timer: remove tango driver Date: Wed, 20 Jan 2021 14:15:57 +0100 [thread overview] Message-ID: <20210120131559.1971359-3-arnd@kernel.org> (raw) In-Reply-To: <20210120131559.1971359-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> The tango platform is getting removed, so the driver is no longer needed. Cc: Marc Gonzalez <marc.w.gonzalez@free.fr> Cc: Mans Rullgard <mans@mansr.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- 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 824a0f6b77d4..1feadd067677 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -560,14 +560,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 41c154478a1a..1089f2ed8560 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -72,7 +72,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 3f94e454ef99..000000000000 --- 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); -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Cc: Mans Rullgard <mans@mansr.com>, Arnd Bergmann <arnd@arndb.de>, Marc Gonzalez <marc.w.gonzalez@free.fr> Subject: [PATCH 2/4] timer: remove tango driver Date: Wed, 20 Jan 2021 14:15:57 +0100 [thread overview] Message-ID: <20210120131559.1971359-3-arnd@kernel.org> (raw) In-Reply-To: <20210120131559.1971359-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> The tango platform is getting removed, so the driver is no longer needed. Cc: Marc Gonzalez <marc.w.gonzalez@free.fr> Cc: Mans Rullgard <mans@mansr.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- 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 824a0f6b77d4..1feadd067677 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -560,14 +560,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 41c154478a1a..1089f2ed8560 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -72,7 +72,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 3f94e454ef99..000000000000 --- 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); -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-20 13:26 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-20 13:15 [PATCH 0/4] clocksource: remove obsolete drivers Arnd Bergmann 2021-01-20 13:15 ` Arnd Bergmann 2021-01-20 13:15 ` [PATCH 1/4] timer: remove u300 driver Arnd Bergmann 2021-01-20 13:15 ` Arnd Bergmann 2021-01-21 8:37 ` Linus Walleij 2021-01-21 8:37 ` Linus Walleij 2021-02-10 10:06 ` [tip: timers/core] clocksource/drivers/u300: Remove the " tip-bot2 for Arnd Bergmann 2021-01-20 13:15 ` Arnd Bergmann [this message] 2021-01-20 13:15 ` [PATCH 2/4] timer: remove tango driver Arnd Bergmann 2021-01-21 13:48 ` Måns Rullgård 2021-01-21 13:48 ` Måns Rullgård 2021-02-10 10:06 ` [tip: timers/core] clocksource/drivers/tango: Remove " tip-bot2 for Arnd Bergmann 2021-01-20 13:15 ` [PATCH 3/4] timer: remove sirf atlas driver Arnd Bergmann 2021-01-20 13:15 ` Arnd Bergmann 2021-01-20 21:21 ` Barry Song 2021-01-20 21:21 ` Barry Song 2021-02-10 10:06 ` [tip: timers/core] clocksource/drivers/atlas: Remove " tip-bot2 for Arnd Bergmann 2021-01-20 13:15 ` [PATCH 4/4] timer: remove sirf prima driver Arnd Bergmann 2021-01-20 13:15 ` Arnd Bergmann 2021-01-20 17:50 ` Joe Perches 2021-01-20 17:50 ` Joe Perches 2021-01-20 20:53 ` Arnd Bergmann 2021-01-20 20:53 ` Arnd Bergmann 2021-01-20 21:11 ` Barry Song 2021-01-20 21:11 ` Barry Song 2021-02-10 10:06 ` [tip: timers/core] clocksource/drivers/prima: Remove " tip-bot2 for Arnd Bergmann 2021-02-03 8:37 ` [PATCH 0/4] clocksource: remove obsolete drivers Daniel Lezcano 2021-02-03 8:37 ` Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210120131559.1971359-3-arnd@kernel.org \ --to=arnd@kernel.org \ --cc=arnd@arndb.de \ --cc=daniel.lezcano@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mans@mansr.com \ --cc=marc.w.gonzalez@free.fr \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.