Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are the first arm-soc bug fixes.  Most of these are OMAP related
  fixes for regressions or minor bugs.  Aside from that, there are a few
  defconfig changes for various platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  iommu/exynos: Fix arm64 allmodconfig build
  ARM: defconfigs: use CONFIG_CPUFREQ_DT
  ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver
  ARM: dts: am437x-sk-evm.dts: fix LCD timings
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
  ARM: OMAP2+: AM43x: Add ID for ES1.2
  ARM: dts: am437x-sk: fix lcd enable pin mux data
  ARM: dts: Fix gpmc regression for omap 2430sdp smc91x
  Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"
  ARM: dts: dra7: fix DSS PLL clock mux registers
  ARM: dts: DRA7: wdt: Fix compatible property for watchdog node
  ARM: OMAP2+: clock: remove unused function prototype

diff --combined drivers/iommu/Kconfig
index 30f0e61341c5ad03a05944caf70471c66eeb2a5c,d8dd6dba1d2f128f2d897714eb044c8a6f1f8298..2fbe3b1dc92d3ec9fffaf8a325ced3deb8cb2fb7
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -144,26 -144,13 +144,26 @@@ config OMAP_IOMM
        select IOMMU_API
  
  config OMAP_IOMMU_DEBUG
 -       tristate "Export OMAP IOMMU internals in DebugFS"
 -       depends on OMAP_IOMMU && DEBUG_FS
 -       help
 -         Select this to see extensive information about
 -         the internal state of OMAP IOMMU in debugfs.
 +      bool "Export OMAP IOMMU internals in DebugFS"
 +      depends on OMAP_IOMMU && DEBUG_FS
 +      ---help---
 +        Select this to see extensive information about
 +        the internal state of OMAP IOMMU in debugfs.
 +
 +        Say N unless you know you need this.
  
 -         Say N unless you know you need this.
 +config ROCKCHIP_IOMMU
 +      bool "Rockchip IOMMU Support"
 +      depends on ARM
 +      depends on ARCH_ROCKCHIP || COMPILE_TEST
 +      select IOMMU_API
 +      select ARM_DMA_USE_IOMMU
 +      help
 +        Support for IOMMUs found on Rockchip rk32xx SOCs.
 +        These IOMMUs allow virtualization of the address space used by most
 +        cores within the multimedia subsystem.
 +        Say Y here if you are using a Rockchip SoC that includes an IOMMU
 +        device.
  
  config TEGRA_IOMMU_GART
        bool "Tegra GART IOMMU Support"
@@@ -187,7 -174,7 +187,7 @@@ config TEGRA_IOMMU_SMM
  
  config EXYNOS_IOMMU
        bool "Exynos IOMMU Support"
-       depends on ARCH_EXYNOS
+       depends on ARCH_EXYNOS && ARM
        select IOMMU_API
        select ARM_DMA_USE_IOMMU
        help