mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 15:47:36 +00:00
c3d66602e0
1. Fix samsung-keypad build error if INPUT is selected as module.
The error though depends on some uncommon build settings so it
is not as easy to trigger.
2. Get rid of 'samsung_device_dma_mask' defined but not used warning.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXS9roAAoJEME3ZuaGi4PXtOEP/RiDgd2W4lZRHoLQHOTrzVC2
fGpSNwBPFTyemJe9+5Qm6XjqPGITn+TbiLl7QZmYu0cxympcXKVNyePiC3poP/oK
f7yw5sfimBACba5/PvqbiqtSl4xCymBuRlhraZ4vOaRAkUPvKW8cFazudYKNLemi
A2as/2MifWZRRUCHlaVnGVRMYZ33MZ/MWqgRTbb5ofJw54Vo9WNPgj+8dVWiM42V
nHULYwTLAedYnlyBFQGuwcY1oJJMVdwC7SKVs2RTLYGSpBhQ9DPTMaLr2lJiSVLU
eWbdrWRZu4+lVLbtnqmuJBNdlIFuN+cvzmqkYbCFSiJKyYbmZpksn/YF1hAOmchq
DZwbMdaJxnoCrObDkGq6p52GjZVX0PdFgZklV34Eo577JzKO8+hLTinFSFwYkGEz
7s2W13WyO95ldMAXoaBqI12UU5U8Blpg6YZ92c5jzS4waATxuPAcYmLnAGRabiul
RCNrvAe6V04T5voEleCB8KVcyMVc/QeVbgpGAjwcQ0wBR+HsTUarZXMk3U6Q+u5m
LEcgWck9nfdzaP5EEI+90xFPTfGr3xvPXgkFfcp7yx8NmNaqqSYw6kJncHBQC1LW
eCdWNkSa5DeISR2xmaHY4g9qET+PahruoS2D5eJ4/ZiRzKYtuSe6fwKoFsJ+iQr+
KUMP9GXMOyRo0c172e0F
=LR9t
-----END PGP SIGNATURE-----
Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes
Two fixes for v4.7 cycle for build issues:
1. Fix samsung-keypad build error if INPUT is selected as module.
The error though depends on some uncommon build settings so it
is not as easy to trigger.
2. Get rid of 'samsung_device_dma_mask' defined but not used warning.
* tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: don't select keyboard driver
ARM: samsung: improve static dma_mask definition
Signed-off-by: Olof Johansson <olof@lixom.net>
154 lines
3.1 KiB
Text
154 lines
3.1 KiB
Text
# arch/arm/mach-exynos/Kconfig
|
|
#
|
|
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the EXYNOS
|
|
|
|
menuconfig ARCH_EXYNOS
|
|
bool "Samsung EXYNOS"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_HAS_BANDGAP
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select ARM_AMBA
|
|
select ARM_GIC
|
|
select COMMON_CLK_SAMSUNG
|
|
select EXYNOS_THERMAL
|
|
select EXYNOS_PMU
|
|
select EXYNOS_SROM
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_S3C2410_I2C if I2C
|
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
|
select HAVE_S3C_RTC if RTC_CLASS
|
|
select PINCTRL
|
|
select PINCTRL_EXYNOS
|
|
select PM_GENERIC_DOMAINS if PM
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_MC
|
|
select SOC_SAMSUNG
|
|
select SRAM
|
|
select THERMAL
|
|
select THERMAL_OF
|
|
select MFD_SYSCON
|
|
select MEMORY
|
|
select CLKSRC_EXYNOS_MCT
|
|
select POWER_RESET
|
|
select POWER_RESET_SYSCON
|
|
select POWER_RESET_SYSCON_POWEROFF
|
|
help
|
|
Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
|
|
|
|
if ARCH_EXYNOS
|
|
|
|
config S5P_DEV_MFC
|
|
bool
|
|
help
|
|
Compile in setup memory (init) code for MFC
|
|
|
|
config ARCH_EXYNOS3
|
|
bool "SAMSUNG EXYNOS3"
|
|
select ARM_CPU_SUSPEND if PM
|
|
help
|
|
Samsung EXYNOS3 (Cortex-A7) SoC based systems
|
|
|
|
config ARCH_EXYNOS4
|
|
bool "SAMSUNG EXYNOS4"
|
|
default y
|
|
select ARM_CPU_SUSPEND if PM_SLEEP
|
|
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
|
|
select CPU_EXYNOS4210
|
|
select GIC_NON_BANKED
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
help
|
|
Samsung EXYNOS4 (Cortex-A9) SoC based systems
|
|
|
|
config ARCH_EXYNOS5
|
|
bool "SAMSUNG EXYNOS5"
|
|
default y
|
|
help
|
|
Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems
|
|
|
|
comment "EXYNOS SoCs"
|
|
|
|
config SOC_EXYNOS3250
|
|
bool "SAMSUNG EXYNOS3250"
|
|
default y
|
|
depends on ARCH_EXYNOS3
|
|
|
|
config CPU_EXYNOS4210
|
|
bool "SAMSUNG EXYNOS4210"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
|
|
config SOC_EXYNOS4212
|
|
bool "SAMSUNG EXYNOS4212"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
|
|
config SOC_EXYNOS4412
|
|
bool "SAMSUNG EXYNOS4412"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
|
|
config SOC_EXYNOS4415
|
|
bool "SAMSUNG EXYNOS4415"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
|
|
config SOC_EXYNOS5250
|
|
bool "SAMSUNG EXYNOS5250"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
|
|
config SOC_EXYNOS5260
|
|
bool "SAMSUNG EXYNOS5260"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
|
|
config SOC_EXYNOS5410
|
|
bool "SAMSUNG EXYNOS5410"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
|
|
config SOC_EXYNOS5420
|
|
bool "SAMSUNG EXYNOS5420"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
|
|
config SOC_EXYNOS5440
|
|
bool "SAMSUNG EXYNOS5440"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
select HAVE_ARM_ARCH_TIMER
|
|
select AUTO_ZRELADDR
|
|
select MIGHT_HAVE_PCI
|
|
select PCI_DOMAINS if PCI
|
|
select PINCTRL_EXYNOS5440
|
|
select PM_OPP
|
|
help
|
|
Enable EXYNOS5440 SoC support
|
|
|
|
config SOC_EXYNOS5800
|
|
bool "SAMSUNG EXYNOS5800"
|
|
default y
|
|
depends on SOC_EXYNOS5420
|
|
|
|
config EXYNOS5420_MCPM
|
|
bool "Exynos5420 Multi-Cluster PM support"
|
|
depends on MCPM && SOC_EXYNOS5420
|
|
select ARM_CCI400_PORT_CTRL
|
|
select ARM_CPU_SUSPEND
|
|
help
|
|
This is needed to provide CPU and cluster power management
|
|
on Exynos5420 implementing big.LITTLE.
|
|
|
|
config EXYNOS_CPU_SUSPEND
|
|
bool
|
|
select ARM_CPU_SUSPEND
|
|
default PM_SLEEP || ARM_EXYNOS_CPUIDLE
|
|
|
|
endif
|