linux-kernel.vger.kernel.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: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 12/17] ARM: davinci: move timer definitions to davinci.h
Date: Fri, 11 Jan 2019 18:21:29 +0100	[thread overview]
Message-ID: <20190111172134.30147-13-brgl@bgdev.pl> (raw)
In-Reply-To: <20190111172134.30147-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>
---
 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 db4c95ef4d5c..dfd1b1ab7b59 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.19.1


  parent reply	other threads:[~2019-01-11 17:22 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 ` Bartosz Golaszewski [this message]
2019-01-11 17:21 ` [PATCH 13/17] ARM: davinci: dm355: " Bartosz Golaszewski
2019-01-11 17:21 ` [PATCH 14/17] ARM: davinci: dm365: " 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-13-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).