From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
David Lechner <david@lechnology.com>
Subject: [RESEND PATCH 05/10] ARM: davinci: move timer definitions to davinci.h
Date: Mon, 22 Jul 2019 15:17:43 +0200 [thread overview]
Message-ID: <20190722131748.30319-6-brgl@bgdev.pl> (raw)
In-Reply-To: <20190722131748.30319-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Boards from the dm* family rely on register offset definitions from
arch/arm/mach-davinci/include/mach/time.h. We'll be removing this file
soon, so move the required defines to davinci.h where the rest of such
constants live.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
---
arch/arm/mach-davinci/davinci.h | 3 +++
arch/arm/mach-davinci/include/mach/time.h | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 56c1835c42e5..208d7a4d3597 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -60,6 +60,9 @@ void davinci_map_sysmod(void);
#define DAVINCI_GPIO_BASE 0x01C67000
int davinci_gpio_register(struct resource *res, int size, void *pdata);
+#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400)
+#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00)
+
/* DM355 base addresses */
#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000
#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
diff --git a/arch/arm/mach-davinci/include/mach/time.h b/arch/arm/mach-davinci/include/mach/time.h
index 1c971d8d8ba8..ba913736990f 100644
--- a/arch/arm/mach-davinci/include/mach/time.h
+++ b/arch/arm/mach-davinci/include/mach/time.h
@@ -11,9 +11,7 @@
#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H
#define __ARCH_ARM_MACH_DAVINCI_TIME_H
-#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400)
#define DAVINCI_TIMER1_BASE (IO_PHYS + 0x21800)
-#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00)
enum {
T0_BOT,
--
2.21.0
next prev parent reply other threads:[~2019-07-22 13:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 13:17 [RESEND PATCH 00/10] ARM: davinci: use the new clocksource driver Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 01/10] ARM: davinci: enable the clocksource driver for DT mode Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 02/10] ARM: davinci: WARN_ON() if clk_get() fails Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 03/10] ARM: davinci: da850: switch to using the clocksource driver Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 04/10] ARM: davinci: da830: " Bartosz Golaszewski
2019-07-22 13:17 ` Bartosz Golaszewski [this message]
2019-07-22 13:17 ` [RESEND PATCH 06/10] ARM: davinci: dm355: " Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 07/10] ARM: davinci: dm365: " Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 08/10] ARM: davinci: dm644x: " Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 09/10] ARM: davinci: dm646x: " Bartosz Golaszewski
2019-07-22 13:17 ` [RESEND PATCH 10/10] ARM: davinci: remove legacy timer support Bartosz Golaszewski
2019-08-05 8:29 ` [RESEND PATCH 00/10] ARM: davinci: use the new clocksource driver Bartosz Golaszewski
2019-08-07 19:28 ` Sekhar Nori
2019-08-08 7:41 ` Bartosz Golaszewski
2019-08-26 13:33 ` Sekhar Nori
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=20190722131748.30319-6-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--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 \
/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).