d71fc239b6
This is a collection of a few late fixes and other misc. stuff that had dependencies on things being merged from other trees. The bulk of the changes are for samsung/exynos SoCs for some changes that needed a few minor reworks so ended up a bit late. The others are mainly for qcom SoCs: a couple fixes and some DTS updates. There's one conflict with drivers/cpufreq/exynos-cpufreq.c because it's now been completely removed, but there were some fixes that hit mainline in the meantime. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIbBAABAgAGBQJV8fkAAAoJEFk3GJrT+8Zllf8P9jj3+TnvbJS/8bWoQoB7BRUZ LZPgi2+sBXylrBV60uQdyodiTHQUMZhbL7GvgEVG0z6yyin7nyijqNkulTbQbWmg WhumLNCNcs8vlZegA/corbwgcVC7FkjOP97HveTe2mgwZ+GaXj9qMRQzBsMqSXEo 4890ZeP1nWBTP42oXOQHkNyKWFBjuERK0dTw2MXj7WE0/Ag8i7ERp76uJQdQ7V5O BpNRwxp3vSCky8rxbpD/avWdlspv1yZGBQyLeIreVq2YQFojvT36K8wHcf6iWBT/ pzGGV/uZM7MnrGZdqSfVEMDHl7Z2s7Ls+sv5F6Md7ErnVDerHGRjw/6lJDjbeH7u trucpsuhz5yhTjpZssGHH2NT8pWxxh8M+AaNOiiH8PuYESAbPAmWLpWkn+648bIn P++Z90DIyfNEqnNSMHkcQYpVt8zc4g75gZfTIIsXLB+DLgzgSK8ergrfyRN/O0zj oFY35g3wHdgisnGve+BAW30zTZtP19TMT36OltWjIkjuRZC29PS2vkH8eTETdVXx 01f/qcpbB1L1rXfIBjNkjx81j89XPd68JIBfctTF5QBOAGm/Dix6tj2mU/N7TNu5 TrBmD3CXdOQbCPaoK/qWX7/b11IN/XOlGL06hhYwbSdvCVy7rNccApXvfnrDWziK Ly923FP1OB7h0Kk1cmo= =85Ck -----END PGP SIGNATURE----- Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull late ARM SoC updates from Kevin Hilman: "This is a collection of a few late fixes and other misc stuff that had dependencies on things being merged from other trees. The bulk of the changes are for samsung/exynos SoCs for some changes that needed a few minor reworks so ended up a bit late. The others are mainly for qcom SoCs: a couple fixes and some DTS updates" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits) ARM: multi_v7_defconfig: Enable PBIAS regulator soc: qcom: smd: Correct fBLOCKREADINTR handling soc: qcom: smd: Use correct remote processor ID soc: qcom: smem: Fix errant private access ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path ARM: dts: qcom: msm8960-cdp: Use stdout-path ARM: dts: qcom: msm8660-surf: Use stdout-path ARM: dts: qcom: ipq8064-ap148: Use stdout-path ARM: dts: qcom: apq8084-mtp: Use stdout-path ARM: dts: qcom: apq8084-ifc6540: Use stdout-path ARM: dts: qcom: apq8074-dragonboard: Use stdout-path ARM: dts: qcom: apq8064-ifc6410: Use stdout-path ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path ARM: dts: qcom: Label serial nodes for aliasing and stdout-path reset: ath79: Fix missing spin_lock_init reset: Add (devm_)reset_control_get stub functions ARM: EXYNOS: switch to using generic cpufreq driver for exynos4x12 cpufreq: exynos: Remove unselectable rule for arm-exynos-cpufreq.o ARM: dts: add iommu property to JPEG device for exynos4 ARM: dts: enable SPI1 for exynos4412-odroidu3 ...
145 lines
2.9 KiB
Plaintext
145 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
|
|
|
|
menuconfig ARCH_EXYNOS
|
|
bool "Samsung EXYNOS" if 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 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 SRAM
|
|
select THERMAL
|
|
select MFD_SYSCON
|
|
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 KEYBOARD_SAMSUNG if INPUT_KEYBOARD
|
|
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
|