diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-12-02 18:01:11 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 20:39:41 +0400 |
| commit | 0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd (patch) | |
| tree | 321ba2a255adc7df72620b5d8233fbac7bf32229 /arch/arm/mach-spear3xx/include/mach/misc_regs.h | |
| parent | 4b6effb6ff38aab60d224cefba76b016552f8bf8 (diff) | |
| download | linux-0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd.tar.xz | |
ARM: spear: move spear.h and misc_regs.h into plat-spear
The spear13xx version of spear.h is completely different from
the newly combined spear3xx/spear6xx version, but we can never
build ARMv5 and ARMv7 platforms together, so there is no
harm in putting all the contents into a single file and adding
appropriate ifdefs.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach/misc_regs.h')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/misc_regs.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/misc_regs.h b/arch/arm/mach-spear3xx/include/mach/misc_regs.h deleted file mode 100644 index 075812c4ca18..000000000000 --- a/arch/arm/mach-spear3xx/include/mach/misc_regs.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * arch/arm/mach-spear3xx/include/mach/misc_regs.h - * - * Miscellaneous registers definitions for SPEAr3xx machine family - * - * Copyright (C) 2009 ST Microelectronics - * Viresh Kumar <viresh.linux@gmail.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#ifndef __MACH_MISC_REGS_H -#define __MACH_MISC_REGS_H - -#include <mach/spear.h> - -#define MISC_BASE IOMEM(VA_SPEAR_ICM3_MISC_REG_BASE) -#define DMA_CHN_CFG (MISC_BASE + 0x0A0) - -#endif /* __MACH_MISC_REGS_H */ |