From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
David Lechner <david@lechnology.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 08/11] ARM: davinci: dm365: switch to using the clocksource driver
Date: Mon, 18 Mar 2019 13:10:57 +0100 [thread overview]
Message-ID: <20190318121100.28132-9-brgl@bgdev.pl> (raw)
In-Reply-To: <20190318121100.28132-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
We now have a proper clocksource driver for davinci. Switch the dm365
platform to using it.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
---
arch/arm/mach-davinci/dm365.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 1d82bb630d11..5e93e0b6410b 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -34,7 +34,8 @@
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/serial.h>
-#include <mach/time.h>
+
+#include <clocksource/timer-davinci.h>
#include "asp.h"
#include "davinci.h"
@@ -659,10 +660,16 @@ static struct davinci_id dm365_ids[] = {
},
};
-static struct davinci_timer_info dm365_timer_info = {
- .timers = davinci_timer_instance,
- .clockevent_id = T0_BOT,
- .clocksource_id = T0_TOP,
+/*
+ * Bottom half of timer0 is used for clockevent, top half is used for
+ * clocksource.
+ */
+static const struct davinci_timer_cfg dm365_timer_cfg = {
+ .reg = DEFINE_RES_IO(DAVINCI_TIMER0_BASE, SZ_4K),
+ .irq = {
+ DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12)),
+ DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34)),
+ },
};
#define DM365_UART1_BASE (IO_PHYS + 0x106000)
@@ -722,7 +729,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = {
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
.pinmux_pins = dm365_pins,
.pinmux_pins_num = ARRAY_SIZE(dm365_pins),
- .timer_info = &dm365_timer_info,
.emac_pdata = &dm365_emac_pdata,
.sram_dma = 0x00010000,
.sram_len = SZ_32K,
@@ -770,6 +776,7 @@ void __init dm365_init_time(void)
{
void __iomem *pll1, *pll2, *psc;
struct clk *clk;
+ int rv;
clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM365_REF_FREQ);
@@ -788,7 +795,8 @@ void __init dm365_init_time(void)
return;
}
- davinci_timer_init(clk);
+ rv = davinci_timer_register(clk, &dm365_timer_cfg);
+ WARN(rv, "Unable to register the timer: %d\n", rv);
}
void __init dm365_register_clocks(void)
--
2.20.1
_______________________________________________
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:[~2019-03-18 12:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 12:10 [PATCH v4 00/11] ARM: davinci: modernize the timer support Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 01/11] clocksource: davinci-timer: new driver Bartosz Golaszewski
2019-04-02 9:21 ` Daniel Lezcano
2019-04-02 12:28 ` Bartosz Golaszewski
2019-04-08 13:49 ` Bartosz Golaszewski
2019-04-08 13:53 ` Daniel Lezcano
2019-04-15 12:36 ` Daniel Lezcano
2019-04-16 13:44 ` Bartosz Golaszewski
2019-04-16 13:56 ` Bartosz Golaszewski
2019-04-16 16:05 ` Daniel Lezcano
2019-03-18 12:10 ` [PATCH v4 02/11] ARM: davinci: enable the clocksource driver for DT mode Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 03/11] ARM: davinci: WARN_ON() if clk_get() fails Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 04/11] ARM: davinci: da850: switch to using the clocksource driver Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 05/11] ARM: davinci: da830: " Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 06/11] ARM: davinci: move timer definitions to davinci.h Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 07/11] ARM: davinci: dm355: switch to using the clocksource driver Bartosz Golaszewski
2019-03-18 12:10 ` Bartosz Golaszewski [this message]
2019-03-18 12:10 ` [PATCH v4 09/11] ARM: davinci: dm644x: " Bartosz Golaszewski
2019-03-18 12:10 ` [PATCH v4 10/11] ARM: davinci: dm646x: " Bartosz Golaszewski
2019-03-18 12:11 ` [PATCH v4 11/11] ARM: davinci: remove legacy timer support Bartosz Golaszewski
2019-03-27 15:36 ` [PATCH v4 00/11] ARM: davinci: modernize the " Sekhar Nori
2019-03-27 17:49 ` 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=20190318121100.28132-9-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=david@lechnology.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nsekhar@ti.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).