diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2011-07-18 03:34:54 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 12:09:45 -0400 |
commit | aa3831cf9d29cfeaebd8c2169378b74111364487 (patch) | |
tree | 0aac34229bbc865b513f4f640dea0aa43d8e2d0f /arch/arm/Kconfig | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) |
ARM: Consolidate the clkdev header files
Now most of ARM machines has the alsmot same __clk_get/put() macro
So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files
But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config
Now there are only 3 caese.
1) define the clk structure with clkdev macro => Need to move clk structure to proper header file
arch/arm/mach-versatile/include/mach/clkdev.h
arch/arm/mach-realview/include/mach/clkdev.h
arch/arm/mach-vexpress/include/mach/clkdev.h
arch/arm/mach-integrator/include/mach/clkdev.h
2) export the __clk_get/put function at clock.c
arch/arm/mach-shmobile/include/mach/clkdev.h
3) demuxing the clk source
arch/arm/mach-u300/include/mach/clkdev.h
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9adc278a22ab..2aa4563aeb91 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -239,6 +239,7 @@ config ARCH_INTEGRATOR | |||
239 | select ARM_AMBA | 239 | select ARM_AMBA |
240 | select ARCH_HAS_CPUFREQ | 240 | select ARCH_HAS_CPUFREQ |
241 | select CLKDEV_LOOKUP | 241 | select CLKDEV_LOOKUP |
242 | select HAVE_MACH_CLKDEV | ||
242 | select ICST | 243 | select ICST |
243 | select GENERIC_CLOCKEVENTS | 244 | select GENERIC_CLOCKEVENTS |
244 | select PLAT_VERSATILE | 245 | select PLAT_VERSATILE |
@@ -250,6 +251,7 @@ config ARCH_REALVIEW | |||
250 | bool "ARM Ltd. RealView family" | 251 | bool "ARM Ltd. RealView family" |
251 | select ARM_AMBA | 252 | select ARM_AMBA |
252 | select CLKDEV_LOOKUP | 253 | select CLKDEV_LOOKUP |
254 | select HAVE_MACH_CLKDEV | ||
253 | select ICST | 255 | select ICST |
254 | select GENERIC_CLOCKEVENTS | 256 | select GENERIC_CLOCKEVENTS |
255 | select ARCH_WANT_OPTIONAL_GPIOLIB | 257 | select ARCH_WANT_OPTIONAL_GPIOLIB |
@@ -265,6 +267,7 @@ config ARCH_VERSATILE | |||
265 | select ARM_AMBA | 267 | select ARM_AMBA |
266 | select ARM_VIC | 268 | select ARM_VIC |
267 | select CLKDEV_LOOKUP | 269 | select CLKDEV_LOOKUP |
270 | select HAVE_MACH_CLKDEV | ||
268 | select ICST | 271 | select ICST |
269 | select GENERIC_CLOCKEVENTS | 272 | select GENERIC_CLOCKEVENTS |
270 | select ARCH_WANT_OPTIONAL_GPIOLIB | 273 | select ARCH_WANT_OPTIONAL_GPIOLIB |
@@ -281,6 +284,7 @@ config ARCH_VEXPRESS | |||
281 | select ARM_AMBA | 284 | select ARM_AMBA |
282 | select ARM_TIMER_SP804 | 285 | select ARM_TIMER_SP804 |
283 | select CLKDEV_LOOKUP | 286 | select CLKDEV_LOOKUP |
287 | select HAVE_MACH_CLKDEV | ||
284 | select GENERIC_CLOCKEVENTS | 288 | select GENERIC_CLOCKEVENTS |
285 | select HAVE_CLK | 289 | select HAVE_CLK |
286 | select HAVE_PATA_PLATFORM | 290 | select HAVE_PATA_PLATFORM |
@@ -638,6 +642,7 @@ config ARCH_SHMOBILE | |||
638 | bool "Renesas SH-Mobile / R-Mobile" | 642 | bool "Renesas SH-Mobile / R-Mobile" |
639 | select HAVE_CLK | 643 | select HAVE_CLK |
640 | select CLKDEV_LOOKUP | 644 | select CLKDEV_LOOKUP |
645 | select HAVE_MACH_CLKDEV | ||
641 | select GENERIC_CLOCKEVENTS | 646 | select GENERIC_CLOCKEVENTS |
642 | select NO_IOPORT | 647 | select NO_IOPORT |
643 | select SPARSE_IRQ | 648 | select SPARSE_IRQ |
@@ -808,6 +813,7 @@ config ARCH_U300 | |||
808 | select ARM_VIC | 813 | select ARM_VIC |
809 | select GENERIC_CLOCKEVENTS | 814 | select GENERIC_CLOCKEVENTS |
810 | select CLKDEV_LOOKUP | 815 | select CLKDEV_LOOKUP |
816 | select HAVE_MACH_CLKDEV | ||
811 | select GENERIC_GPIO | 817 | select GENERIC_GPIO |
812 | help | 818 | help |
813 | Support for ST-Ericsson U300 series mobile platforms. | 819 | Support for ST-Ericsson U300 series mobile platforms. |