Merge tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "Lots of isolated bug fixes that were not found to be important enough
  to be submitted before the merge window or backported into stable
  kernels.

  The vast majority of these came out of Arnd's randconfig testing and
  just prevents running into build-time bugs in configurations that we
  do not care about in practice"

* tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: at91: fix a typo
  ARM: moxart: fix CPU selection
  ARM: tegra: fix board DT pinmux setup
  ARM: nspire: Fix compiler warning
  IXP4xx: Fix DMA masks.
  Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
  IXP4xx: Fix Goramo Multilink GPIO conversion.
  Revert "ARM: ixp4xx: fix gpio rework"
  ARM: tegra: make debug_ll code build for ARMv6
  ARM: sunxi: fix build for THUMB2_KERNEL
  ARM: exynos: add missing include of linux/module.h
  ARM: exynos: fix l2x0 saved regs handling
  ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
  ARM: samsung: select ATAGS where necessary
  ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
  ARM: samsung: allow serial driver to be disabled
  ARM: s5pv210: enable IDE support in MACH_TORBRECK
  ARM: s5p64x0: fix building with only one soc type
  ARM: s3c64xx: select power domains only when used
  ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
  ...

1 files changed, 14 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6b4ac5de6dec..79bea0b34d1f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -423,6 +423,7 @@ config ARCH_EFM32
         bool "Energy Micro efm32"
         depends on !MMU
         select ARCH_REQUIRE_GPIOLIB
+        select AUTO_ZRELADDR
         select ARM_NVIC
         # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,
         # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO
@@ -698,6 +699,7 @@ config ARCH_RPC
         select ARCH_MAY_HAVE_PC_FDC
         select ARCH_SPARSEMEM_ENABLE
         select ARCH_USES_GETTIMEOFFSET
+        select CPU_SA110
         select FIQ
         select HAVE_IDE
         select HAVE_PATA_PLATFORM
@@ -732,6 +734,7 @@ config ARCH_S3C24XX
         bool "Samsung S3C24XX SoCs"
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
+        select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
         select GENERIC_CLOCKEVENTS
@@ -754,6 +757,7 @@ config ARCH_S3C64XX
         select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
         select ARM_VIC
+        select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
         select COMMON_CLK
@@ -765,7 +769,7 @@ config ARCH_S3C64XX
         select HAVE_TCM
         select NO_IOPORT
         select PLAT_SAMSUNG
-        select PM_GENERIC_DOMAINS
+        select PM_GENERIC_DOMAINS if PM
         select S3C_DEV_NAND
         select S3C_GPIO_TRACK
         select SAMSUNG_ATAGS
@@ -776,6 +780,7 @@ config ARCH_S3C64XX
 
 config ARCH_S5P64X0
         bool "Samsung S5P6440 S5P6450"
+        select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
         select CPU_V6
@@ -794,6 +799,7 @@ config ARCH_S5P64X0
 config ARCH_S5PC100
         bool "Samsung S5PC100"
         select ARCH_REQUIRE_GPIOLIB
+        select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
         select CPU_V7
@@ -813,6 +819,7 @@ config ARCH_S5PV210
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_HOLES_MEMORYMODEL
         select ARCH_SPARSEMEM_ENABLE
+        select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
         select CPU_V7
@@ -886,6 +893,12 @@ menu "Multiple platform selection"
 
 comment "CPU Core family selection"
 
+config ARCH_MULTI_V4
+        bool "ARMv4 based platforms (FA526)"
+        depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
+        select CPU_FA526
+
 config ARCH_MULTI_V4T
         bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
         depends on !ARCH_MULTI_V6_V7