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

[karo-tx-uboot.git] / arch / arm / include / asm / arch-rmobile / rcar-base.h

diff --git a/arch/arm/include/asm/arch-rmobile/rcar-base.h b/arch/arm/include/asm/arch-rmobile/rcar-base.h
index 4331d3137c0e96456576d2560b348fbbf0837571..9c1439b76467b940ca4d194aaef0b476917dea2f 100644 (file)
--- a/arch/arm/include/asm/arch-rmobile/rcar-base.h
+++ b/arch/arm/include/asm/arch-rmobile/rcar-base.h
@@ -10,7 +10,7 @@
 #define __ASM_ARCH_RCAR_BASE_H
 
 /*
- * R-Car (R8A7790/R8A7791) I/O Addresses
+ * R-Car (R8A7790/R8A7791/R8A7794) I/O Addresses
  */
 #define RWDT_BASE              0xE6020000
 #define SWDT_BASE              0xE6030000
@@ -21,6 +21,14 @@
 #define GPIO5_BASE             0xE6055000
 #define SH_QSPI_BASE           0xE6B10000
 
+/* SCIF */
+#define SCIF0_BASE             0xE6E60000
+#define SCIF1_BASE             0xE6E68000
+#define SCIF2_BASE             0xE6E58000
+#define SCIF3_BASE             0xE6EA8000
+#define SCIF4_BASE             0xE6EE0000
+#define SCIF5_BASE             0xE6EE8000
+
 #define S3C_BASE               0xE6784000
 #define S3C_INT_BASE           0xE6784A00
 #define S3C_MEDIA_BASE         0xE6784B00
@@ -108,7 +116,7 @@
 #define SYS_AXI_SAT1_BASE      0xFF8009C0
 #define SYS_AXI_SDM0_BASE      0xFF800A00
 #define SYS_AXI_SDM1_BASE      0xFF800A40
-#define SYS_AXI_TRAB_BASE      0xFF800B00
+#define SYS_AXI_TRAB_BASE      0xFF800B00 /* SYS_AXI_TRKF_BASE in R*A7794 */
 #define SYS_AXI_UDM0_BASE      0xFF800B80
 #define SYS_AXI_UDM1_BASE      0xFF800BC0
 
@@ -377,6 +385,8 @@
 #define PLL0CR                 0xE61500D8
 #define PLL0_STC_MASK          0x7F000000
 #define PLL0_STC_BIT           24
+#define PLLECR                 0xE61500D0
+#define PLL0ST                 0x100
 
 #ifndef __ASSEMBLY__
 #include <asm/types.h>