clocksource/drivers/tango-xtal: Rename the file for consistency
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 19 Feb 2019 09:19:33 +0000 (10:19 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Sat, 23 Feb 2019 11:13:45 +0000 (12:13 +0100)
For the sake of consistency, let's rename the file to a name similar
to other file names in this directory.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/Makefile
drivers/clocksource/tango_xtal.c [deleted file]
drivers/clocksource/timer-tango-xtal.c [new file with mode: 0644]

index cdd210ff89ea3df9fd5dfc85f3d70823252cae32..47052ea15f2019fa58b47e4e6de237a5ab9dbf70 100644 (file)
@@ -69,7 +69,7 @@ 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)                += tango_xtal.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_ASM9260_TIMER)            += asm9260_timer.o
diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c
deleted file mode 100644 (file)
index 3f94e45..0000000
+++ /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);
diff --git a/drivers/clocksource/timer-tango-xtal.c b/drivers/clocksource/timer-tango-xtal.c
new file mode 100644 (file)
index 0000000..3f94e45
--- /dev/null
@@ -0,0 +1,57 @@
+// 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);