linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 13/17] ARM: davinci: dm355: switch to using the clocksource driver
Date: Fri, 11 Jan 2019 18:21:30 +0100	[thread overview]
Message-ID: <20190111172134.30147-14-brgl@bgdev.pl> (raw)
In-Reply-To: <20190111172134.30147-1-brgl@bgdev.pl>

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

We now have a proper clocksource driver for davinci. Switch the platform
to using it.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 arch/arm/mach-davinci/dm355.c | 36 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 07ad9d6c9cae..2fd1186ceef6 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -29,7 +29,8 @@
 #include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
-#include <mach/time.h>
+
+#include <clocksource/timer-davinci.h>
 
 #include "asp.h"
 #include "davinci.h"
@@ -617,16 +618,24 @@ static struct davinci_id dm355_ids[] = {
 	},
 };
 
-/*
- * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers
- * T0_TOP: Timer 0, top   :  clocksource for generic timekeeping
- * 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 = {
+		.start		= DAVINCI_TIMER0_BASE,
+		.end		= DAVINCI_TIMER0_BASE + SZ_4K,
+		.flags		= IORESOURCE_MEM,
+	},
+	.irq = {
+		{
+			.start	= IRQ_TINT0_TINT12,
+			.end	= IRQ_TINT0_TINT12,
+			.flags	= IORESOURCE_IRQ,
+		},
+		{
+			.start	= IRQ_TINT0_TINT34,
+			.end	= IRQ_TINT0_TINT34,
+			.flags	= IORESOURCE_IRQ,
+		}
+	}
 };
 
 static struct plat_serial8250_port dm355_serial0_platform_data[] = {
@@ -708,7 +717,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = {
 	.intc_type		= DAVINCI_INTC_TYPE_AINTC,
 	.intc_irq_prios		= dm355_default_priorities,
 	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,
-	.timer_info		= &dm355_timer_info,
 	.sram_dma		= 0x00010000,
 	.sram_len		= SZ_32K,
 };
@@ -735,6 +743,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 +756,8 @@ void __init dm355_init_time(void)
 	clk = clk_get(NULL, "timer0");
 	WARN(IS_ERR(clk), "Unable to get the timer clock\n");
 
-	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.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-01-11 17:24 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-11 17:21 [PATCH 00/17] ARM: davinci: modernize the timer support Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 01/17] ARM: dts: da850: fix interrupt numbers for clocksource Bartosz Golaszewski
2019-01-17 14:22   ` Sekhar Nori
2019-01-17 14:32     ` Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 02/17] clocksource: davinci-timer: new driver Bartosz Golaszewski
2019-01-14 12:20   ` Sekhar Nori
2019-01-14 16:39     ` Bartosz Golaszewski
2019-01-16  9:18       ` Sekhar Nori
2019-01-17 12:42         ` Sekhar Nori
2019-01-17 14:01           ` Bartosz Golaszewski
2019-01-24 12:09             ` Sekhar Nori
2019-01-23  0:30       ` Kevin Hilman
2019-01-11 17:21 ` [PATCH 03/17] ARM: davinci: enable the clocksource driver for DT mode Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 04/17] ARM: davinci: da850: WARN() if clk_get() fails Bartosz Golaszewski
2019-01-14 12:22   ` Sekhar Nori
2019-01-11 17:21 ` [PATCH 05/17] ARM: davinci: da830: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 06/17] ARM: davinci: dm355: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 07/17] ARM: davinci: dm365: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 08/17] ARM: davinci: dm644x: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 09/17] ARM: davinci: dm646x: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 10/17] ARM: davinci: da850: switch to using the clocksource driver Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 11/17] ARM: davinci: da830: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 12/17] ARM: davinci: move timer definitions to davinci.h Bartosz Golaszewski
2019-01-11 17:21 ` Bartosz Golaszewski [this message]
2019-01-11 17:21 ` [PATCH 14/17] ARM: davinci: dm365: switch to using the clocksource driver Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 15/17] ARM: davinci: dm644x: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 16/17] ARM: davinci: dm646x: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 17/17] ARM: davinci: remove legacy timer support Bartosz Golaszewski

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=20190111172134.30147-14-brgl@bgdev.pl \
    --to=brgl@bgdev.pl \
    --cc=bgolaszewski@baylibre.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=khilman@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=nsekhar@ti.com \
    --cc=robh+dt@kernel.org \
    --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).