From: Olof Johansson Date: Thu, 29 Aug 2013 20:29:35 +0000 (-0700) Subject: Merge tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.12-rc1~75^2~7 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d6a99de704283fbc8249fde6c4aaf517cf531d31;p=~andy%2Flinux Merge tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/all update mach-exynos v2 for v3.12 - enable ARCH_HAS_BANDGAP for exynos SoCs - always enable PM domains for exynos4x12 - skip C1 cpuidle state for exynos5440 * tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Skip C1 cpuidle state for exynos5440 ARM: EXYNOS: always enable PM domains support for EXYNOS4X12 ARM: EXYNOS: enable ARCH_HAS_BANDGAP Signed-off-by: Olof Johansson --- d6a99de704283fbc8249fde6c4aaf517cf531d31 diff --cc arch/arm/mach-exynos/Kconfig index 5952e68c76c,db147bdce82..56fe819ee10 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -92,7 -98,7 +98,8 @@@ config SOC_EXYNOS544 bool "SAMSUNG EXYNOS5440" default y depends on ARCH_EXYNOS5 + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE + select ARCH_HAS_BANDGAP select ARCH_HAS_OPP select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR