---

yaml --- r: 370671 b: refs/heads/master c: 0ec05c3 h: refs/heads/master i: 370669: d0798a0 370667: a3662f2 370663: 2c6fd17 370655: be10259 v: v3
git-mirror · Mar 12, 2013 · d5b549e · d5b549e
1 parent 54e2953
commit d5b549e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 136 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6effb6ff38aab60d224cefba76b016552f8bf8
+refs/heads/master: 0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd
diff --git a/trunk/arch/arm/mach-spear13xx/include/mach/spear.h b/trunk/arch/arm/mach-spear13xx/include/mach/spear.h
diff --git a/trunk/arch/arm/mach-spear6xx/include/mach/misc_regs.h b/trunk/arch/arm/mach-spear6xx/include/mach/misc_regs.h
diff --git a/trunk/arch/arm/mach-spear6xx/include/mach/spear.h b/trunk/arch/arm/mach-spear6xx/include/mach/spear.h
diff --git a/...rm/mach-spear3xx/include/mach/misc_regs.h → ...h/arm/plat-spear/include/mach/misc_regs.h b/...rm/mach-spear3xx/include/mach/misc_regs.h → ...h/arm/plat-spear/include/mach/misc_regs.h
diff --git a/...ch/arm/mach-spear3xx/include/mach/spear.h → .../arch/arm/plat-spear/include/mach/spear.h b/...ch/arm/mach-spear3xx/include/mach/spear.h → .../arch/arm/plat-spear/include/mach/spear.h
@@ -15,6 +15,8 @@
 
 #include <asm/memory.h>
 
+#if defined(CONFIG_ARCH_SPEAR3XX) || defined (CONFIG_ARCH_SPEAR6XX)
+
 /* ICM1 - Low speed connection */
 #define SPEAR_ICM1_2_BASE		UL(0xD0000000)
 #define VA_SPEAR_ICM1_2_BASE		UL(0xFD000000)
@@ -55,5 +57,45 @@
 	#define SPEAR320_UART5_PCLK_SHIFT		11
 	#define SPEAR320_UART6_PCLK_SHIFT		12
 	#define SPEAR320_RS485_PCLK_SHIFT		13
+#endif /* SPEAR3xx || SPEAR6XX */
+
+#ifdef CONFIG_ARCH_SPEAR13XX
+
+#define PERIP_GRP2_BASE				UL(0xB3000000)
+#define VA_PERIP_GRP2_BASE			IOMEM(0xFE000000)
+#define MCIF_SDHCI_BASE				UL(0xB3000000)
+#define SYSRAM0_BASE				UL(0xB3800000)
+#define VA_SYSRAM0_BASE				IOMEM(0xFE800000)
+#define SYS_LOCATION				(VA_SYSRAM0_BASE + 0x600)
+
+#define PERIP_GRP1_BASE				UL(0xE0000000)
+#define VA_PERIP_GRP1_BASE			IOMEM(0xFD000000)
+#define UART_BASE				UL(0xE0000000)
+#define VA_UART_BASE				IOMEM(0xFD000000)
+#define SSP_BASE				UL(0xE0100000)
+#define MISC_BASE				UL(0xE0700000)
+#define VA_MISC_BASE				IOMEM(0xFD700000)
+
+#define A9SM_AND_MPMC_BASE			UL(0xEC000000)
+#define VA_A9SM_AND_MPMC_BASE			IOMEM(0xFC000000)
+
+/* A9SM peripheral offsets */
+#define A9SM_PERIP_BASE				UL(0xEC800000)
+#define VA_A9SM_PERIP_BASE			IOMEM(0xFC800000)
+#define VA_SCU_BASE				(VA_A9SM_PERIP_BASE + 0x00)
+
+#define L2CC_BASE				UL(0xED000000)
+#define VA_L2CC_BASE				IOMEM(UL(0xFB000000))
+
+/* others */
+#define DMAC0_BASE				UL(0xEA800000)
+#define DMAC1_BASE				UL(0xEB000000)
+#define MCIF_CF_BASE				UL(0xB2800000)
+
+/* Debug uart for linux, will be used for debug and uncompress messages */
+#define SPEAR_DBG_UART_BASE			UART_BASE
+#define VA_SPEAR_DBG_UART_BASE			VA_UART_BASE
+
+#endif /* SPEAR13XX */
 
 #endif /* __MACH_SPEAR_H */