ARM: davinci: move timer definitions to davinci.h (66ae81dc) · Commits · 戴 / test

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> Signed-off-by:

Sekhar Nori <nsekhar@ti.com>

arch/arm/mach-davinci/davinci.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/mach-davinci/include/mach/time.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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,

Admin message