aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:58:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:58:40 -0500
commitb274776c54c320763bc12eb035c0e244f76ccb43 (patch)
treec75b70d0824a7ae029229b19d61884039abf2127 /arch/arm/Kconfig
parentb24174b0cbbe383c5bb6097aeb24480b8fd2d338 (diff)
parent3b1209e7994c4d31ff9932a7f566ae1c96b3c443 (diff)
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups from Arnd Bergmann: "A large number of cleanups, all over the platforms. This is dominated largely by the Samsung platforms (s3c, s5p, exynos) and a few of the others moving code out of arch/arm into more appropriate subsystems. The clocksource and irqchip drivers are now abstracted to the point where platforms that are already cleaned up do not need to even specify the driver they use, it can all get configured from the device tree as we do for normal device drivers. The clocksource changes basically touch every single platform in the process. We further clean up the use of platform specific header files here, with the goal of turning more of the platforms over to being "multiplatform" enabled, which implies that they cannot expose their headers to architecture independent code any more. It is expected that no functional changes are part of the cleanup. The overall reduction in total code lines is mostly the result of removing broken and obsolete code." * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits) ARM: mvebu: correct gated clock documentation ARM: kirkwood: add missing include for nsa310 ARM: exynos: move exynos4210-combiner to drivers/irqchip mfd: db8500-prcmu: update resource passing drivers/db8500-cpufreq: delete dangling include ARM: at91: remove NEOCORE 926 board sunxi: Cleanup the reset code and add meaningful registers defines ARM: S3C24XX: header mach/regs-mem.h local ARM: S3C24XX: header mach/regs-power.h local ARM: S3C24XX: header mach/regs-s3c2412-mem.h local ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ ARM: S3C24XX: transform s3c2443 subirqs into new structure ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs ARM: S3C24XX: move s3c2443 irq code to irq.c ARM: S3C24XX: transform s3c2416 irqs into new structure ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs ARM: S3C24XX: move s3c2416 irq init to common irq code ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property ARM: S3C24XX: Move irq syscore-ops to irq-pm clocksource: always define CLOCKSOURCE_OF_DECLARE ...
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig16
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 09238c83e6d6..c038431f2567 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -344,10 +344,10 @@ config ARCH_BCM2835
344 select ARM_ERRATA_411920 344 select ARM_ERRATA_411920
345 select ARM_TIMER_SP804 345 select ARM_TIMER_SP804
346 select CLKDEV_LOOKUP 346 select CLKDEV_LOOKUP
347 select CLKSRC_OF
347 select COMMON_CLK 348 select COMMON_CLK
348 select CPU_V6 349 select CPU_V6
349 select GENERIC_CLOCKEVENTS 350 select GENERIC_CLOCKEVENTS
350 select GENERIC_GPIO
351 select MULTI_IRQ_HANDLER 351 select MULTI_IRQ_HANDLER
352 select PINCTRL 352 select PINCTRL
353 select PINCTRL_BCM2835 353 select PINCTRL_BCM2835
@@ -642,9 +642,9 @@ config ARCH_TEGRA
642 select ARCH_HAS_CPUFREQ 642 select ARCH_HAS_CPUFREQ
643 select CLKDEV_LOOKUP 643 select CLKDEV_LOOKUP
644 select CLKSRC_MMIO 644 select CLKSRC_MMIO
645 select CLKSRC_OF
645 select COMMON_CLK 646 select COMMON_CLK
646 select GENERIC_CLOCKEVENTS 647 select GENERIC_CLOCKEVENTS
647 select GENERIC_GPIO
648 select HAVE_CLK 648 select HAVE_CLK
649 select HAVE_SMP 649 select HAVE_SMP
650 select MIGHT_HAVE_CACHE_L2X0 650 select MIGHT_HAVE_CACHE_L2X0
@@ -744,7 +744,6 @@ config ARCH_S3C24XX
744 select ARCH_HAS_CPUFREQ 744 select ARCH_HAS_CPUFREQ
745 select ARCH_USES_GETTIMEOFFSET 745 select ARCH_USES_GETTIMEOFFSET
746 select CLKDEV_LOOKUP 746 select CLKDEV_LOOKUP
747 select GENERIC_GPIO
748 select HAVE_CLK 747 select HAVE_CLK
749 select HAVE_S3C2410_I2C if I2C 748 select HAVE_S3C2410_I2C if I2C
750 select HAVE_S3C2410_WATCHDOG if WATCHDOG 749 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -787,7 +786,6 @@ config ARCH_S5P64X0
787 select CLKSRC_MMIO 786 select CLKSRC_MMIO
788 select CPU_V6 787 select CPU_V6
789 select GENERIC_CLOCKEVENTS 788 select GENERIC_CLOCKEVENTS
790 select GENERIC_GPIO
791 select HAVE_CLK 789 select HAVE_CLK
792 select HAVE_S3C2410_I2C if I2C 790 select HAVE_S3C2410_I2C if I2C
793 select HAVE_S3C2410_WATCHDOG if WATCHDOG 791 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -802,7 +800,6 @@ config ARCH_S5PC100
802 select ARCH_USES_GETTIMEOFFSET 800 select ARCH_USES_GETTIMEOFFSET
803 select CLKDEV_LOOKUP 801 select CLKDEV_LOOKUP
804 select CPU_V7 802 select CPU_V7
805 select GENERIC_GPIO
806 select HAVE_CLK 803 select HAVE_CLK
807 select HAVE_S3C2410_I2C if I2C 804 select HAVE_S3C2410_I2C if I2C
808 select HAVE_S3C2410_WATCHDOG if WATCHDOG 805 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -820,7 +817,6 @@ config ARCH_S5PV210
820 select CLKSRC_MMIO 817 select CLKSRC_MMIO
821 select CPU_V7 818 select CPU_V7
822 select GENERIC_CLOCKEVENTS 819 select GENERIC_CLOCKEVENTS
823 select GENERIC_GPIO
824 select HAVE_CLK 820 select HAVE_CLK
825 select HAVE_S3C2410_I2C if I2C 821 select HAVE_S3C2410_I2C if I2C
826 select HAVE_S3C2410_WATCHDOG if WATCHDOG 822 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -838,7 +834,6 @@ config ARCH_EXYNOS
838 select CLKDEV_LOOKUP 834 select CLKDEV_LOOKUP
839 select CPU_V7 835 select CPU_V7
840 select GENERIC_CLOCKEVENTS 836 select GENERIC_CLOCKEVENTS
841 select GENERIC_GPIO
842 select HAVE_CLK 837 select HAVE_CLK
843 select HAVE_S3C2410_I2C if I2C 838 select HAVE_S3C2410_I2C if I2C
844 select HAVE_S3C2410_WATCHDOG if WATCHDOG 839 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -873,7 +868,6 @@ config ARCH_U300
873 select COMMON_CLK 868 select COMMON_CLK
874 select CPU_ARM926T 869 select CPU_ARM926T
875 select GENERIC_CLOCKEVENTS 870 select GENERIC_CLOCKEVENTS
876 select GENERIC_GPIO
877 select HAVE_TCM 871 select HAVE_TCM
878 select SPARSE_IRQ 872 select SPARSE_IRQ
879 help 873 help
@@ -957,7 +951,6 @@ config ARCH_VT8500_SINGLE
957 select COMMON_CLK 951 select COMMON_CLK
958 select CPU_ARM926T 952 select CPU_ARM926T
959 select GENERIC_CLOCKEVENTS 953 select GENERIC_CLOCKEVENTS
960 select GENERIC_GPIO
961 select HAVE_CLK 954 select HAVE_CLK
962 select MULTI_IRQ_HANDLER 955 select MULTI_IRQ_HANDLER
963 select SPARSE_IRQ 956 select SPARSE_IRQ
@@ -1086,17 +1079,12 @@ source "arch/arm/mach-realview/Kconfig"
1086source "arch/arm/mach-sa1100/Kconfig" 1079source "arch/arm/mach-sa1100/Kconfig"
1087 1080
1088source "arch/arm/plat-samsung/Kconfig" 1081source "arch/arm/plat-samsung/Kconfig"
1089source "arch/arm/plat-s3c24xx/Kconfig"
1090 1082
1091source "arch/arm/mach-socfpga/Kconfig" 1083source "arch/arm/mach-socfpga/Kconfig"
1092 1084
1093source "arch/arm/plat-spear/Kconfig" 1085source "arch/arm/plat-spear/Kconfig"
1094 1086
1095source "arch/arm/mach-s3c24xx/Kconfig" 1087source "arch/arm/mach-s3c24xx/Kconfig"
1096if ARCH_S3C24XX
1097source "arch/arm/mach-s3c2412/Kconfig"
1098source "arch/arm/mach-s3c2440/Kconfig"
1099endif
1100 1088
1101if ARCH_S3C64XX 1089if ARCH_S3C64XX
1102source "arch/arm/mach-s3c64xx/Kconfig" 1090source "arch/arm/mach-s3c64xx/Kconfig"