sunxi: update cpu_sunxi_ncat2.h

The cpu_sunxi_ncat2.h header file contains addresses of some peripherals
that are needed for the SPL, for chips that belong to the "NCAT2"
generation.
The Allwinner A523 is a member of this group, but a few addresses
differ, and we need a few more addresses, for playing with the core
reset, for instance.

Add the new addresses needed for the A523 and guard existing definitions
that conflict with that new chip.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h b/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h
index c04ddb3f1d4f959523c4e0658f4ace2d84ba5a83..bcfdc0a41c5d722066990c1d705804da7107c4e4 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h
@@ -21,14 +21,32 @@
 #define SUNXI_SID_BASE                 0x03006200
 #define SUNXI_GIC400_BASE              0x03020000
 
+#ifdef CONFIG_MACH_SUN55I_A523
+#define SUNXI_DRAM_COM_BASE            0x03120000
+#define SUNXI_DRAM_CTL0_BASE           0x03130000
+#define SUNXI_DRAM_PHY0_BASE           0x03140000
+#endif
+
 #define SUNXI_MMC0_BASE                        0x04020000
 #define SUNXI_MMC1_BASE                        0x04021000
 #define SUNXI_MMC2_BASE                        0x04022000
 
+#ifndef CONFIG_MACH_SUN55I_A523
 #define SUNXI_R_CPUCFG_BASE            0x07000400
+#endif
 #define SUNXI_PRCM_BASE                        0x07010000
+#define SUNXI_R_WDOG_BASE              0x07020400
+#ifdef CONFIG_MACH_SUN55I_A523
+#define SUNXI_R_CPUCFG_BASE            0x07050000
+#endif
+#define SUNXI_R_TWI_BASE               0x07081400
+#define SUNXI_RTC_BASE                 0x07090000
 
+#ifdef CONFIG_MACH_SUN55I_A523
+#define SUNXI_CPUCFG_BASE              0x08815000
+#else
 #define SUNXI_CPUCFG_BASE              0x09010000
+#endif
 
 #define SUNXI_CPU_PLL_CFG_BASE         0x08817000