From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 May 2012 19:22:27 +0000 (-0700)
Subject: Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~2751
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ce53044c68cf4fb6c50a2a0d88786be65fae7235;p=firefly-linux-kernel-4.4.55.git

Merge tag 'drivers' of git://git./linux/kernel/git/arm/arm-soc

Pull arm-soc driver specific updates from Olof Johansson:
 "These changes are specific to some driver that may be used by multiple
  boards or socs.  The most significant change in here is the move of
  the samsung iommu code from a platform specific in-kernel interface to
  the generic iommu subsystem."

Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  mmc: dt: Consolidate DT bindings
  iommu/exynos: Add iommu driver for EXYNOS Platforms
  ARM: davinci: optimize the DMA ISR
  ARM: davinci: implement DEBUG_LL port choice
  ARM: tegra: Add SMMU enabler in AHB
  ARM: tegra: Add Tegra AHB driver
  Input: pxa27x_keypad add choice to set direct_key_mask
  Input: pxa27x_keypad direct key may be low active
  Input: pxa27x_keypad bug fix for direct_key_mask
  Input: pxa27x_keypad keep clock on as wakeup source
  ARM: dt: tegra: pinmux changes for USB ULPI
  ARM: tegra: add USB ULPI PHY reset GPIO to device tree
  ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
  ARM: tegra: change pll_p_out4's rate to 24MHz
  ARM: tegra: fix pclk rate
  ARM: tegra: reparent sclk to pll_c_out1
  ARM: tegra: Add pllc clock init table
  ARM: dt: tegra cardhu: basic audio support
  ARM: dt: tegra30.dtsi: Add audio-related nodes
  ARM: tegra: add AUXDATA required for audio
  ...
---

ce53044c68cf4fb6c50a2a0d88786be65fae7235
diff --cc arch/arm/mach-exynos/Kconfig
index 15b05b89cc39,2c35fd404cae..e3cfd5fd7dd5
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -200,7 -200,7 +200,8 @@@ config MACH_SMDKV31
  	select S3C_DEV_HSMMC2
  	select S3C_DEV_HSMMC3
  	select SAMSUNG_DEV_BACKLIGHT
 +	select EXYNOS_DEV_DRM
+ 	select EXYNOS_DEV_SYSMMU
  	select EXYNOS4_DEV_AHCI
  	select SAMSUNG_DEV_KEYPAD
  	select EXYNOS4_DEV_DMA
@@@ -256,8 -250,8 +255,9 @@@ config MACH_UNIVERSAL_C21
  	select S5P_DEV_MFC
  	select S5P_DEV_ONENAND
  	select S5P_DEV_TV
+ 	select EXYNOS_DEV_SYSMMU
  	select EXYNOS4_DEV_DMA
 +	select EXYNOS_DEV_DRM
  	select EXYNOS4_SETUP_FIMD0
  	select EXYNOS4_SETUP_I2C1
  	select EXYNOS4_SETUP_I2C3
@@@ -331,7 -322,7 +331,8 @@@ config MACH_ORIGE
  	select S5P_DEV_USB_EHCI
  	select SAMSUNG_DEV_BACKLIGHT
  	select SAMSUNG_DEV_PWM
 +	select EXYNOS_DEV_DRM
+ 	select EXYNOS_DEV_SYSMMU
  	select EXYNOS4_DEV_DMA
  	select EXYNOS4_DEV_USB_OHCI
  	select EXYNOS4_SETUP_FIMD0