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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v3 07/11] ARM: davinci: dm355: switch to using the clocksource driver
Date: Tue, 26 Feb 2019 13:06:29 +0100 [thread overview]
Message-ID: <20190226120633.18200-8-brgl@bgdev.pl> (raw)
In-Reply-To: <20190226120633.18200-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
We now have a proper clocksource driver for davinci. Switch the dm355
platform to using it.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
arch/arm/mach-davinci/dm355.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 57c5a660758e..c51a574c1b4c 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -29,7 +29,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"
@@ -624,10 +625,12 @@ static struct davinci_id dm355_ids[] = {
* T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code)
* T1_TOP: Timer 1, top : <unused>
*/
-static struct davinci_timer_info dm355_timer_info = {
- .timers = davinci_timer_instance,
- .clockevent_id = T0_BOT,
- .clocksource_id = T0_TOP,
+static const struct davinci_timer_cfg dm355_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)),
+ },
};
static struct plat_serial8250_port dm355_serial0_platform_data[] = {
@@ -705,7 +708,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = {
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
.pinmux_pins = dm355_pins,
.pinmux_pins_num = ARRAY_SIZE(dm355_pins),
- .timer_info = &dm355_timer_info,
.sram_dma = 0x00010000,
.sram_len = SZ_32K,
};
@@ -732,6 +734,7 @@ void __init dm355_init_time(void)
{
void __iomem *pll1, *psc;
struct clk *clk;
+ int rv;
clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM355_REF_FREQ);
@@ -747,7 +750,8 @@ void __init dm355_init_time(void)
return;
}
- davinci_timer_init(clk);
+ rv = davinci_timer_register(clk, &dm355_timer_cfg);
+ WARN(rv, "Unable to register the timer: %d\n", rv);
}
static struct resource dm355_pll2_resources[] = {
--
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-02-26 12:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 12:06 [PATCH v3 00/11] ARM: davinci: modernize the timer support Bartosz Golaszewski
2019-02-26 12:06 ` [PATCH v3 01/11] clocksource: davinci-timer: new driver Bartosz Golaszewski
2019-03-12 18:18 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 02/11] ARM: davinci: enable the clocksource driver for DT mode Bartosz Golaszewski
2019-03-12 18:19 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 03/11] ARM: davinci: WARN_ON() if clk_get() fails Bartosz Golaszewski
2019-03-12 18:23 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 04/11] ARM: davinci: da850: switch to using the clocksource driver Bartosz Golaszewski
2019-03-12 18:36 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 05/11] ARM: davinci: da830: " Bartosz Golaszewski
2019-03-12 18:40 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 06/11] ARM: davinci: move timer definitions to davinci.h Bartosz Golaszewski
2019-03-12 18:41 ` David Lechner
2019-02-26 12:06 ` Bartosz Golaszewski [this message]
2019-03-12 18:43 ` [PATCH v3 07/11] ARM: davinci: dm355: switch to using the clocksource driver David Lechner
2019-02-26 12:06 ` [PATCH v3 08/11] ARM: davinci: dm365: " Bartosz Golaszewski
2019-03-12 18:43 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 09/11] ARM: davinci: dm644x: " Bartosz Golaszewski
2019-03-12 18:44 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 10/11] ARM: davinci: dm646x: " Bartosz Golaszewski
2019-03-12 18:45 ` David Lechner
2019-02-26 12:06 ` [PATCH v3 11/11] ARM: davinci: remove legacy timer support Bartosz Golaszewski
2019-03-12 18:46 ` David Lechner
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=20190226120633.18200-8-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=david@lechnology.com \
--cc=devicetree@vger.kernel.org \
--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).