Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm...

diff --combined arch/arm/mach-exynos/Kconfig
index 85afb031b6766909354b88502c379598f2b1d37a,e103c290bc9e37ca5871d8e8182493e9fa0447c5,e103c290bc9e37ca5871d8e8182493e9fa0447c5,e103c290bc9e37ca5871d8e8182493e9fa0447c5,e103c290bc9e37ca5871d8e8182493e9fa0447c5,3967c62ea2710d931b004d6459e3dd01481dfc48,e103c290bc9e37ca5871d8e8182493e9fa0447c5,e103c290bc9e37ca5871d8e8182493e9fa0447c5..70f94c87479df7d4dc2ab8aa25356461a3066b14
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
--- 3/arch/arm/mach-exynos/Kconfig
--- 4/arch/arm/mach-exynos/Kconfig
--- 5/arch/arm/mach-exynos/Kconfig
--- 6/arch/arm/mach-exynos/Kconfig
--- 7/arch/arm/mach-exynos/Kconfig
--- 8/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@@@@@@@ -105,11 -105,11 -105,11 -105,11 -105,11 -105,6 -105,11 -105,11 +105,6 @@@@@@@@@ config EXYNOS4_SETUP_FIMD
                help
                  Common setup code for FIMD0.
        
----- --config EXYNOS_DEV_SYSMMU
----- --        bool
----- --        help
----- --          Common setup code for SYSTEM MMU in EXYNOS platforms
----- --
        config EXYNOS4_DEV_USB_OHCI
                bool
                help
@@@@@@@@@ -414,7 -414,7 -414,7 -414,7 -414,7 -409,7 -414,7 -414,7 +409,7 @@@@@@@@@ config MACH_EXYNOS4_D
                select CPU_EXYNOS4210
                select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
                select PINCTRL
 -------        select PINCTRL_EXYNOS4
 +++++++        select PINCTRL_EXYNOS
                select USE_OF
                help
                  Machine support for Samsung Exynos4 machine with device tree enabled.

diff --combined drivers/iommu/Kconfig
index e39f9dbf297ba977384bc9e1733ec7990c245c77,e39f9dbf297ba977384bc9e1733ec7990c245c77,e39f9dbf297ba977384bc9e1733ec7990c245c77,3f0b15a10e189f6980395d4f62d60ffcc312bf19,d364494c9e7c4a36bba32e27e5e667a20f63534d,e39f9dbf297ba977384bc9e1733ec7990c245c77,e39f9dbf297ba977384bc9e1733ec7990c245c77,e39f9dbf297ba977384bc9e1733ec7990c245c77..8fc1c7fa20b58fbe6cfb62fa5b30d37d3337991e
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
--- 3/drivers/iommu/Kconfig
--- 4/drivers/iommu/Kconfig
--- 5/drivers/iommu/Kconfig
--- 6/drivers/iommu/Kconfig
--- 7/drivers/iommu/Kconfig
--- 8/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@@@@@@@ -158,7 -158,7 -158,7 -158,7 -158,7 -158,7 -158,7 -158,7 +158,7 @@@@@@@@@ config TEGRA_IOMMU_GAR
        
        config TEGRA_IOMMU_SMMU
                bool "Tegra SMMU IOMMU Support"
--- ----        depends on ARCH_TEGRA_3x_SOC && TEGRA_AHB
+++ ++++        depends on ARCH_TEGRA && TEGRA_AHB
                select IOMMU_API
                help
                  Enables support for remapping discontiguous physical memory
@@@@@@@@@ -187,4 -187,4 -187,4 -187,4 -187,78 -187,4 -187,4 -187,4 +187,78 @@@@@@@@@ config EXYNOS_IOMMU_DEBU
        
                  Say N unless you need kernel log message for IOMMU debugging
        
++++ +++config SHMOBILE_IPMMU
++++ +++        bool
++++ +++
++++ +++config SHMOBILE_IPMMU_TLB
++++ +++        bool
++++ +++
++++ +++config SHMOBILE_IOMMU
++++ +++        bool "IOMMU for Renesas IPMMU/IPMMUI"
++++ +++        default n
++++ +++        depends on (ARM && ARCH_SHMOBILE)
++++ +++        select IOMMU_API
++++ +++        select ARM_DMA_USE_IOMMU
++++ +++        select SHMOBILE_IPMMU
++++ +++        select SHMOBILE_IPMMU_TLB
++++ +++        help
++++ +++          Support for Renesas IPMMU/IPMMUI. This option enables
++++ +++          remapping of DMA memory accesses from all of the IP blocks
++++ +++          on the ICB.
++++ +++
++++ +++          Warning: Drivers (including userspace drivers of UIO
++++ +++          devices) of the IP blocks on the ICB *must* use addresses
++++ +++          allocated from the IPMMU (iova) for DMA with this option
++++ +++          enabled.
++++ +++
++++ +++          If unsure, say N.
++++ +++
++++ +++choice
++++ +++        prompt "IPMMU/IPMMUI address space size"
++++ +++        default SHMOBILE_IOMMU_ADDRSIZE_2048MB
++++ +++        depends on SHMOBILE_IOMMU
++++ +++        help
++++ +++          This option sets IPMMU/IPMMUI address space size by
++++ +++          adjusting the 1st level page table size. The page table size
++++ +++          is calculated as follows:
++++ +++
++++ +++              page table size = number of page table entries * 4 bytes
++++ +++              number of page table entries = address space size / 1 MiB
++++ +++
++++ +++          For example, when the address space size is 2048 MiB, the
++++ +++          1st level page table size is 8192 bytes.
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_2048MB
++++ +++                bool "2 GiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_1024MB
++++ +++                bool "1 GiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_512MB
++++ +++                bool "512 MiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_256MB
++++ +++                bool "256 MiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_128MB
++++ +++                bool "128 MiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_64MB
++++ +++                bool "64 MiB"
++++ +++
++++ +++        config SHMOBILE_IOMMU_ADDRSIZE_32MB
++++ +++                bool "32 MiB"
++++ +++
++++ +++endchoice
++++ +++
++++ +++config SHMOBILE_IOMMU_L1SIZE
++++ +++        int
++++ +++        default 8192 if SHMOBILE_IOMMU_ADDRSIZE_2048MB
++++ +++        default 4096 if SHMOBILE_IOMMU_ADDRSIZE_1024MB
++++ +++        default 2048 if SHMOBILE_IOMMU_ADDRSIZE_512MB
++++ +++        default 1024 if SHMOBILE_IOMMU_ADDRSIZE_256MB
++++ +++        default 512 if SHMOBILE_IOMMU_ADDRSIZE_128MB
++++ +++        default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
++++ +++        default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
++++ +++
        endif # IOMMU_SUPPORT