mirror of
https://github.com/torvalds/linux
synced 2024-09-22 03:55:39 +00:00
f4b96f5e4f
get in before -rc1. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJR3RSDAAoJEBvUPslcq6Vz6rAQAK16H8VJB9l8pEzJGDS7/X0j 8N+j1Zry0Ij0ZHQpzqR71h8Sh72PfdIVFnT6b04cJgBON92dmXqiBNv1pdIHRPlC DGyQ0W+vucF38iXRqSa7koxpEM8RRQcS4kJ3wUkvBwWA6s1x+MB/J5qtRkYg6iKI GPcBjIdh1pjBSLq37sCLQcSGxKHNH19i47KcN8C6piqiKNxnoDyVZKLAAt0jZNxe SrezGdz0keADDf/7/30TAjDBgY1LlWog6M9Ue6D6FO1YwFegWgM7XX3GsZfuhZ4s +zssE73UJETauOl7JJ+nsn8GDm2Q6U8zVm1pU9GEezm0pMCTJ2SDhtoxWY5zR/mH rYh8ia8IrMlX4mvQbKFhTZH3LWxLlGEJC21sCf5U3KuXv39SJlIjX9Qa/erWpMxd 9McTyTWL7I6fXuMsuSUjdawvODem3kUXmwANNyMA1/NZ6uAMqK60l+/yLLjJRdFh jdFSeZ976ARp52TFqaf47KN3Jc5jJs5NVQ191JaoTxwWmgvaX0mcG8iKO7oaE+1y fR096Mt3jobMAbiQUdDnetkNBEiJ8uSJq4Y5IecvshAuPxu71eEB6OCdYQqmUfRo Nq8zPGmPKwT8rhCc2B3Paw++uI74f+S0WgsodGsDiBeFHzFztBY4PWKrXfxr9zzY 01kscgUWM3MJ8xRWtVE+ =kO4u -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Omap fixes and minor defconfig updates that would be good to get in before -rc1. * tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver ARM: OMAP2+: devices: remove duplicated include from devices.c ARM: OMAP3: igep0020: Set DSS pins in correct mux mode. ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled ARM: OMAP2+: Cocci spatch "ptr_ret.spatch" ARM: OMAP2+: Remove obsolete Makefile line ARM: OMAP5: Enable Cortex A15 errata 798181 ARM: scu: provide inline dummy functions when SCU is not present ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4 ARM: OMAP2+: timer: initialize before using oh_name Signed-off-by: Olof Johansson <olof@lixom.net> Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
137 lines
2.9 KiB
Plaintext
137 lines
2.9 KiB
Plaintext
# arch/arm/mach-exynos/Kconfig
|
|
#
|
|
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the EXYNOS4
|
|
|
|
if ARCH_EXYNOS
|
|
|
|
menu "SAMSUNG EXYNOS SoCs Support"
|
|
|
|
config ARCH_EXYNOS4
|
|
bool "SAMSUNG EXYNOS4"
|
|
default y
|
|
select GIC_NON_BANKED
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_SMP
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
select PINCTRL
|
|
help
|
|
Samsung EXYNOS4 SoCs based systems
|
|
|
|
config ARCH_EXYNOS5
|
|
bool "SAMSUNG EXYNOS5"
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_SMP
|
|
select PINCTRL
|
|
help
|
|
Samsung EXYNOS5 (Cortex-A15) SoC based systems
|
|
|
|
comment "EXYNOS SoCs"
|
|
|
|
config CPU_EXYNOS4210
|
|
bool "SAMSUNG EXYNOS4210"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select ARM_CPU_SUSPEND if PM
|
|
select PINCTRL_EXYNOS
|
|
select PM_GENERIC_DOMAINS if PM
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS4210 CPU support
|
|
|
|
config SOC_EXYNOS4212
|
|
bool "SAMSUNG EXYNOS4212"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select PINCTRL_EXYNOS
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS4212 SoC support
|
|
|
|
config SOC_EXYNOS4412
|
|
bool "SAMSUNG EXYNOS4412"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select PINCTRL_EXYNOS
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS4412 SoC support
|
|
|
|
config SOC_EXYNOS5250
|
|
bool "SAMSUNG EXYNOS5250"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select PINCTRL_EXYNOS
|
|
select PM_GENERIC_DOMAINS if PM
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS5250 SoC support
|
|
|
|
config SOC_EXYNOS5420
|
|
bool "SAMSUNG EXYNOS5420"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select PM_GENERIC_DOMAINS if PM
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
help
|
|
Enable EXYNOS5420 SoC support
|
|
|
|
config SOC_EXYNOS5440
|
|
bool "SAMSUNG EXYNOS5440"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select ARCH_HAS_OPP
|
|
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
|
|
|
|
comment "Flattened Device Tree based board for EXYNOS SoCs"
|
|
|
|
config MACH_EXYNOS4_DT
|
|
bool "Samsung Exynos4 Machine using device tree"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select ARM_AMBA
|
|
select CLKSRC_OF
|
|
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
|
|
select CPU_EXYNOS4210
|
|
select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
|
|
select S5P_DEV_MFC
|
|
help
|
|
Machine support for Samsung Exynos4 machine with device tree enabled.
|
|
Select this if a fdt blob is available for the Exynos4 SoC based board.
|
|
Note: This is under development and not all peripherals can be supported
|
|
with this machine file.
|
|
|
|
config MACH_EXYNOS5_DT
|
|
bool "SAMSUNG EXYNOS5 Machine using device tree"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select ARM_AMBA
|
|
select CLKSRC_OF
|
|
select USB_ARCH_HAS_XHCI
|
|
help
|
|
Machine support for Samsung EXYNOS5 machine with device tree enabled.
|
|
Select this if a fdt blob is available for the EXYNOS5 SoC based board.
|
|
|
|
endmenu
|
|
|
|
endif
|