[PATCH 1/9] ARM: at91: move pmc base address into soc header
Bo Shen
voice.shen at atmel.com
Wed Sep 17 03:21:27 PDT 2014
As the PMC base address may be different between each SoC,
so move them to SoC header.
Signed-off-by: Bo Shen <voice.shen at atmel.com>
---
arch/arm/mach-at91/include/mach/at91rm9200.h | 1 +
arch/arm/mach-at91/include/mach/at91sam9260.h | 2 ++
arch/arm/mach-at91/include/mach/at91sam9261.h | 1 +
arch/arm/mach-at91/include/mach/at91sam9263.h | 2 ++
arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 ++
arch/arm/mach-at91/include/mach/at91sam9n12.h | 1 +
arch/arm/mach-at91/include/mach/at91sam9x5.h | 1 +
arch/arm/mach-at91/include/mach/hardware.h | 2 --
arch/arm/mach-at91/include/mach/sama5d3.h | 2 ++
9 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h
index 36e940d..4fe8fd8 100644
--- a/arch/arm/mach-at91/include/mach/at91rm9200.h
+++ b/arch/arm/mach-at91/include/mach/at91rm9200.h
@@ -118,6 +118,7 @@
#define AT91_MATRIX 0 /* not supported */
+#define AT91_PMC 0xfffffc00
/*
* Internal Memory.
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 3f3a0e1..919901d 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -125,6 +125,8 @@
#define AT91_ID_UHP AT91SAM9260_ID_UHP
#define AT91_PMC_UHP AT91SAM926x_PMC_UHP
+#define AT91_PMC 0xfffffc00
+
/*
* Internal Memory.
*/
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index 1b48e23..9124df5 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -102,6 +102,7 @@
#define AT91_USART2 AT91SAM9261_BASE_US2
#define AT91_NB_USART 4
+#define AT91_PMC 0xfffffc00
/*
* Internal Memory.
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index b42d191..e7ca8b6 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -129,6 +129,8 @@
#define AT91_ID_UHP AT91SAM9263_ID_UHP
#define AT91_PMC_UHP AT91SAM926x_PMC_UHP
+#define AT91_PMC 0xfffffc00
+
/*
* Internal Memory.
*/
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index c81bb80..ff12ce4 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -134,6 +134,8 @@
#define AT91_USART3 AT91SAM9G45_BASE_US3
#define AT91_NB_USART 5
+#define AT91_PMC 0xfffffc00
+
/*
* Internal Memory.
*/
diff --git a/arch/arm/mach-at91/include/mach/at91sam9n12.h b/arch/arm/mach-at91/include/mach/at91sam9n12.h
index 26bdd13..249bde4 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9n12.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9n12.h
@@ -129,6 +129,7 @@
#define AT91_USART3 AT91SAM9X5_BASE_US3
#define AT91_NB_USART 5
+#define AT91_PMC 0xfffffc00
/*
* Internal Memory.
diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h
index 13b4f44..7ba2e3b 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9x5.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h
@@ -136,6 +136,7 @@
#define AT91_USART3 AT91SAM9X5_BASE_US3
#define AT91_NB_USART 5
+#define AT91_PMC 0xfffffc00
/*
* Internal Memory.
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 8f004de..2ef1780 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -20,8 +20,6 @@
/* 9263, 9g45 */
#define AT91_BASE_DBGU1 0xffffee00
-#define AT91_PMC 0xfffffc00
-
#if defined(CONFIG_ARCH_AT91RM9200)
#include <mach/at91rm9200.h>
#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h
index 6884ff6..e98b101 100644
--- a/arch/arm/mach-at91/include/mach/sama5d3.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3.h
@@ -108,6 +108,8 @@
#define AT91_NB_USART 3
+#define AT91_PMC 0xfffffc00
+
/*
* Internal Memory.
*/
--
2.1.0.24.g4109c28
More information about the barebox
mailing list