diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-31 16:06:58 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-08 12:42:14 +0200 |
| commit | a8d902db221e1e2dcbbd32efbf89055ed69f8e56 (patch) | |
| tree | 5005b8f5cffbcd5832806bdd8129a6a230068e42 /arch | |
| parent | 8f8a59c664e976f0c32d7d4550fd99dca7c4ef7b (diff) | |
| download | op-kernel-dev-a8d902db221e1e2dcbbd32efbf89055ed69f8e56.zip op-kernel-dev-a8d902db221e1e2dcbbd32efbf89055ed69f8e56.tar.gz | |
avr32: Add MMIO address definitions for certain controllers
Hardcoded MMIO base addresses are used a few places throughout the
platform code. Move these into the chip-specific header file so that
adding support for new chips becomes a bit easier.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/mach-at32ap/clock.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 8 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pm.c | 4 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pm.h | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c index 4642117..6c27dda 100644 --- a/arch/avr32/mach-at32ap/clock.c +++ b/arch/avr32/mach-at32ap/clock.c @@ -16,6 +16,8 @@ #include <linux/device.h> #include <linux/string.h> +#include <mach/chip.h> + #include "clock.h" static DEFINE_SPINLOCK(clk_lock); diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h index d18a305..31b44e1 100644 --- a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h +++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h @@ -46,4 +46,12 @@ #define DMAC_DMAREQ_2 9 #define DMAC_DMAREQ_3 10 +/* + * Base addresses of controllers that may be accessed early by + * platform code. + */ +#define PM_BASE 0xfff00000 +#define HMATRIX_BASE 0xfff00800 +#define SDRAMC_BASE 0xfff03800 + #endif /* __ASM_ARCH_AT32AP700X_H__ */ diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c index a0cbef5..f021edf 100644 --- a/arch/avr32/mach-at32ap/pm.c +++ b/arch/avr32/mach-at32ap/pm.c @@ -14,12 +14,10 @@ #include <asm/cacheflush.h> #include <asm/sysreg.h> +#include <mach/chip.h> #include <mach/pm.h> #include <mach/sram.h> -/* FIXME: This is only valid for AP7000 */ -#define SDRAMC_BASE 0xfff03800 - #include "sdramc.h" #define SRAM_PAGE_FLAGS (SYSREG_BIT(TLBELO_D) | SYSREG_BF(SZ, 1) \ diff --git a/arch/avr32/mach-at32ap/pm.h b/arch/avr32/mach-at32ap/pm.h index 694d521..532a373 100644 --- a/arch/avr32/mach-at32ap/pm.h +++ b/arch/avr32/mach-at32ap/pm.h @@ -4,14 +4,6 @@ #ifndef __ARCH_AVR32_MACH_AT32AP_PM_H__ #define __ARCH_AVR32_MACH_AT32AP_PM_H__ -/* - * We can reduce the code size a bit by using a constant here. Since - * this file is only used on AVR32 AP CPUs with segmentation enabled, - * it's safe to not use ioremap. Generic drivers should of course - * never do this. - */ -#define AT32_PM_BASE 0xfff00000 - /* PM register offsets */ #define PM_MCCTRL 0x0000 #define PM_CKSEL 0x0004 @@ -113,8 +105,8 @@ /* Register access macros */ #define pm_readl(reg) \ - __raw_readl((void __iomem __force *)AT32_PM_BASE + PM_##reg) + __raw_readl((void __iomem __force *)PM_BASE + PM_##reg) #define pm_writel(reg,value) \ - __raw_writel((value), (void __iomem __force *)AT32_PM_BASE + PM_##reg) + __raw_writel((value), (void __iomem __force *)PM_BASE + PM_##reg) #endif /* __ARCH_AVR32_MACH_AT32AP_PM_H__ */ |
