From e992bc7bca96062b2e98a751c8caaf43ff2a8c36 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Thu, 31 Jul 2008 16:06:58 +0200
Subject: [PATCH] --- yaml --- r: 108099 b: refs/heads/master c:
 a8d902db221e1e2dcbbd32efbf89055ed69f8e56 h: refs/heads/master i:   108097:
 f669c23878d8037dca9593acd58d10fe58e457f7   108095:
 002862366561b15b37731d616ff8a9ba1bbb10ad v: v3

---
 [refs]                                               |  2 +-
 trunk/arch/avr32/mach-at32ap/clock.c                 |  2 ++
 .../arch/avr32/mach-at32ap/include/mach/at32ap700x.h |  8 ++++++++
 trunk/arch/avr32/mach-at32ap/pm.c                    |  4 +---
 trunk/arch/avr32/mach-at32ap/pm.h                    | 12 ++----------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 4a2ee2958d1e..0373da84fa62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f8a59c664e976f0c32d7d4550fd99dca7c4ef7b
+refs/heads/master: a8d902db221e1e2dcbbd32efbf89055ed69f8e56
diff --git a/trunk/arch/avr32/mach-at32ap/clock.c b/trunk/arch/avr32/mach-at32ap/clock.c
index 4642117cc9ab..6c27ddac5adf 100644
--- a/trunk/arch/avr32/mach-at32ap/clock.c
+++ b/trunk/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/trunk/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/trunk/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
index d18a3053be0d..31b44e13ec32 100644
--- a/trunk/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
+++ b/trunk/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/trunk/arch/avr32/mach-at32ap/pm.c b/trunk/arch/avr32/mach-at32ap/pm.c
index a0cbef54fc2a..f021edfeaab0 100644
--- a/trunk/arch/avr32/mach-at32ap/pm.c
+++ b/trunk/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/trunk/arch/avr32/mach-at32ap/pm.h b/trunk/arch/avr32/mach-at32ap/pm.h
index 694d521edc2f..532a3732c214 100644
--- a/trunk/arch/avr32/mach-at32ap/pm.h
+++ b/trunk/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__ */