aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-04 15:31:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-04 15:31:18 -0400
commit6fa52ed33bea997374a88dbacbba5bf8c7ac4fef (patch)
treea0904b78d66c9b99d6acf944cf58bcaa0cffc511 /arch/arm/mach-exynos/Kconfig
parent1db772216f48978d5146b858586f6178433aad38 (diff)
parentbc8fd900c4d460b4e4bf785bb48bfced0ac9941b (diff)
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver changes from Olof Johansson: "This is a rather large set of patches for device drivers that for one reason or another the subsystem maintainer preferred to get merged through the arm-soc tree. There are both new drivers as well as existing drivers that are getting converted from platform-specific code into standalone drivers using the appropriate subsystem specific interfaces. In particular, we can now have pinctrl, clk, clksource and irqchip drivers in one file per driver, without the need to call into platform specific interface, or to get called from platform specific code, as long as all information about the hardware is provided through a device tree. Most of the drivers we touch this time are for clocksource. Since now most of them are part of drivers/clocksource, I expect that we won't have to touch these again from arm-soc and can let the clocksource maintainers take care of these in the future. Another larger part of this series is specific to the exynos platform, which is seeing some significant effort in upstreaming and modernization of its device drivers this time around, which unfortunately is also the cause for the churn and a lot of the merge conflicts. There is one new subsystem that gets merged as part of this series: the reset controller interface, which is a very simple interface for taking devices on the SoC out of reset or back into reset. Patches to use this interface on i.MX follow later in this merge window, and we are going to have other platforms (at least tegra and sirf) get converted in 3.11. This will let us get rid of platform specific callbacks in a number of platform independent device drivers." * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits) irqchip: s3c24xx: add missing __init annotations ARM: dts: Disable the RTC by default on exynos5 clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3} ARM: exynos: restore mach/regs-clock.h for exynos5 clocksource: exynos_mct: fix build error on non-DT pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register() irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure reset: NULL deref on allocation failure reset: Add reset controller API dt: describe base reset signal binding ARM: EXYNOS: Add arm-pmu DT binding for exynos421x ARM: EXYNOS: Add arm-pmu DT binding for exynos5250 ARM: EXYNOS: Enable PMUs for exynos4 irqchip: exynos-combiner: Correct combined IRQs for exynos4 irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq ARM: EXYNOS: fix compilation error introduced due to common clock migration clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3} clk: exynos4: export clocks required for fimc-is clk: samsung: Fix compilation error clk: tegra: fix enum tegra114_clk to match binding ...
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index f22f69e2d081..d19edff0ea6e 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -63,6 +63,7 @@ config SOC_EXYNOS5250
63 bool "SAMSUNG EXYNOS5250" 63 bool "SAMSUNG EXYNOS5250"
64 default y 64 default y
65 depends on ARCH_EXYNOS5 65 depends on ARCH_EXYNOS5
66 select PM_GENERIC_DOMAINS if PM
66 select S5P_PM if PM 67 select S5P_PM if PM
67 select S5P_SLEEP if PM 68 select S5P_SLEEP if PM
68 select S5P_DEV_MFC 69 select S5P_DEV_MFC
@@ -83,12 +84,6 @@ config SOC_EXYNOS5440
83 help 84 help
84 Enable EXYNOS5440 SoC support 85 Enable EXYNOS5440 SoC support
85 86
86config EXYNOS4_MCT
87 bool
88 default y
89 help
90 Use MCT (Multi Core Timer) as kernel timers
91
92config EXYNOS_ATAGS 87config EXYNOS_ATAGS
93 bool "ATAGS based boot for EXYNOS (deprecated)" 88 bool "ATAGS based boot for EXYNOS (deprecated)"
94 depends on !ARCH_MULTIPLATFORM 89 depends on !ARCH_MULTIPLATFORM
@@ -285,8 +280,8 @@ config MACH_UNIVERSAL_C210
285 select S5P_DEV_ONENAND 280 select S5P_DEV_ONENAND
286 select S5P_DEV_TV 281 select S5P_DEV_TV
287 select S5P_GPIO_INT 282 select S5P_GPIO_INT
288 select S5P_HRT
289 select S5P_SETUP_MIPIPHY 283 select S5P_SETUP_MIPIPHY
284 select SAMSUNG_HRT
290 help 285 help
291 Machine support for Samsung Mobile Universal S5PC210 Reference 286 Machine support for Samsung Mobile Universal S5PC210 Reference
292 Board. 287 Board.
@@ -414,10 +409,12 @@ config MACH_EXYNOS4_DT
414 bool "Samsung Exynos4 Machine using device tree" 409 bool "Samsung Exynos4 Machine using device tree"
415 depends on ARCH_EXYNOS4 410 depends on ARCH_EXYNOS4
416 select ARM_AMBA 411 select ARM_AMBA
412 select CLKSRC_OF
417 select CPU_EXYNOS4210 413 select CPU_EXYNOS4210
418 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD 414 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
419 select PINCTRL 415 select PINCTRL
420 select PINCTRL_EXYNOS 416 select PINCTRL_EXYNOS
417 select S5P_DEV_MFC
421 select USE_OF 418 select USE_OF
422 help 419 help
423 Machine support for Samsung Exynos4 machine with device tree enabled. 420 Machine support for Samsung Exynos4 machine with device tree enabled.
@@ -430,6 +427,7 @@ config MACH_EXYNOS5_DT
430 default y 427 default y
431 depends on ARCH_EXYNOS5 428 depends on ARCH_EXYNOS5
432 select ARM_AMBA 429 select ARM_AMBA
430 select CLKSRC_OF
433 select USE_OF 431 select USE_OF
434 help 432 help
435 Machine support for Samsung EXYNOS5 machine with device tree enabled. 433 Machine support for Samsung EXYNOS5 machine with device tree enabled.