merge from tag exdroid4.0.1r1-v0.4

.gitignore

@@ -86,11 +86,13 @@ GTAGS
 \#*#
 
 # build generated files
-modules/example/Module.symvers
-modules/mali/DX910-SW-99002-r2p1-05rel1/src/devicedrv/mali/Module.symvers
-modules/mali/DX910-SW-99002-r2p1-05rel1/src/devicedrv/ump/Module.symvers
-modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/os/linux/Module.symvers
+output/
+arch/arm/*/pm/standby/standby.code
+arch/arm/*/pm/standby/standby.map
+modules/example/*.symvers
+modules/mali/*/*/*/*/*.symvers
 modules/wifi/ar6003/AR6kSDK.build_3.1_RC.514/host/os/linux/Module.symvers
+modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/os/linux/Module.symvers
 modules/wifi/nano-c047.12/kernel/ic/Module.symvers
 modules/wifi/nano-c047.12/kernel/ksdio/Module.symvers
-output/
+modules/wifi/usi-bcm4329/v4.218.248.15/open-src/src/dhd/linux/dhd-cdc-sdmmc-gpl-*

arch/arm/Kconfig

@@ -46,6 +46,7 @@ config CHIP_ID
         int
         default 1120 if ARCH_SUN3I
         default 1123 if ARCH_SUN4I
+	default 1125 if ARCH_SUN5I
 
 config ARM_HAS_SG_CHAIN
 	bool
@@ -706,19 +707,35 @@ config ARCH_PICOXCELL
 config ARCH_SUN4I
 	bool "AllWinner SUN4I Platform"
 	select CPU_V7
-    select ARM_AMBA
+	select ARM_AMBA
 	select HAVE_CLK
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select GENERIC_CLOCKEVENTS
 	select ARCH_HAS_CPUFREQ
 	select ARM_L1_CACHE_SHIFT_6
 	help
-	  This enables support for Allwinner Technology Co., Ltd A1x SoC based systems
+	  This enables support for Allwinner Technology Co., Ltd A10 SoC based systems
+
+config ARCH_SUN5I
+        bool "AllWinner SUN5I Platform"
+        select CPU_V7
+        select ARM_AMBA
+        select HAVE_CLK
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select GENERIC_CLOCKEVENTS
+        select ARCH_HAS_CPUFREQ
+        select ARM_L1_CACHE_SHIFT_6
+        help
+          This enables support for Allwinner Technology Co., Ltd A12/A13 SoC based systems
 
 #if ARCH_SUN4I
-#source "arch/arm/mach-sun4i/Kconfig
+#source "arch/arm/mach-sun4i/Kconfig"
 #endif
+if ARCH_SUN5I
+source "arch/arm/mach-sun5i/Kconfig"
+endif
 
 config ARCH_PNX4008
 	bool "Philips Nexperia PNX4008 Mobile"