Merge branch 'master' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / include / asm / arch-pantheon / pantheon.h

diff --git a/arch/arm/include/asm/arch-pantheon/pantheon.h b/arch/arm/include/asm/arch-pantheon/pantheon.h
index e4ed087b0cfa06e06486b87d11a3a62c6f015599..d5e9ba048e43f33a92c3fe5c0cc962a63782c11e 100644 (file)
--- a/arch/arm/include/asm/arch-pantheon/pantheon.h
+++ b/arch/arm/include/asm/arch-pantheon/pantheon.h
@@ -25,13 +25,6 @@
 #ifndef _PANTHEON_H
 #define _PANTHEON_H
 
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-#include <asm/io.h>
-#endif /* __ASSEMBLY__ */
-
-#include <asm/arch/cpu.h>
-
 /* Common APB clock register bit definitions */
 #define APBC_APBCLK     (1<<0)  /* APB Bus Clock Enable */
 #define APBC_FNCLK      (1<<1)  /* Functional Clock Enable */
@@ -39,6 +32,12 @@
 /* Functional Clock Selection Mask */
 #define APBC_FNCLKSEL(x)        (((x) & 0xf) << 4)
 
+/* Common APMU register bit definitions */
+#define APMU_PERI_CLK  (1<<4)  /* Peripheral Clock Enable */
+#define APMU_AXI_CLK   (1<<3)  /* AXI Clock Enable*/
+#define APMU_PERI_RST  (1<<1)  /* Peripheral Reset */
+#define APMU_AXI_RST   (1<<0)  /* AXI Reset */
+
 /* Register Base Addresses */
 #define PANTHEON_DRAM_BASE     0xB0000000
 #define PANTHEON_TIMER_BASE    0xD4014000
@@ -49,6 +48,7 @@
 #define PANTHEON_GPIO_BASE     0xD4019000
 #define PANTHEON_MFPR_BASE     0xD401E000
 #define PANTHEON_MPMU_BASE     0xD4050000
+#define PANTHEON_APMU_BASE     0xD4282800
 #define PANTHEON_CPU_BASE      0xD4282C00
 
 #endif /* _PANTHEON_H */