diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2012-07-05 06:35:33 -0400 |
|---|---|---|
| committer | Pawel Moll <pawel.moll@arm.com> | 2012-07-12 11:16:56 -0400 |
| commit | 56a34b03ff427046494db87f05fc810aaedd23a5 (patch) | |
| tree | 414b461d46f17d73c994e301b75aa381922bc308 | |
| parent | d927daf5c81c9b6bf2d6a83dc4c8c60268930ee5 (diff) | |
ARM: versatile: Make plat-versatile clock optional
... in preparation for common clock coming for Integrator
and Versatile Express.
Based on Linus Walleij's "ARM: integrator: convert to common
clock" patch.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-versatile/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a91009c61870..17beb66c6fa1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -260,6 +260,7 @@ config ARCH_INTEGRATOR | |||
| 260 | select ICST | 260 | select ICST |
| 261 | select GENERIC_CLOCKEVENTS | 261 | select GENERIC_CLOCKEVENTS |
| 262 | select PLAT_VERSATILE | 262 | select PLAT_VERSATILE |
| 263 | select PLAT_VERSATILE_CLOCK | ||
| 263 | select PLAT_VERSATILE_FPGA_IRQ | 264 | select PLAT_VERSATILE_FPGA_IRQ |
| 264 | select NEED_MACH_IO_H | 265 | select NEED_MACH_IO_H |
| 265 | select NEED_MACH_MEMORY_H | 266 | select NEED_MACH_MEMORY_H |
| @@ -277,6 +278,7 @@ config ARCH_REALVIEW | |||
| 277 | select GENERIC_CLOCKEVENTS | 278 | select GENERIC_CLOCKEVENTS |
| 278 | select ARCH_WANT_OPTIONAL_GPIOLIB | 279 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 279 | select PLAT_VERSATILE | 280 | select PLAT_VERSATILE |
| 281 | select PLAT_VERSATILE_CLOCK | ||
| 280 | select PLAT_VERSATILE_CLCD | 282 | select PLAT_VERSATILE_CLCD |
| 281 | select ARM_TIMER_SP804 | 283 | select ARM_TIMER_SP804 |
| 282 | select GPIO_PL061 if GPIOLIB | 284 | select GPIO_PL061 if GPIOLIB |
| @@ -295,6 +297,7 @@ config ARCH_VERSATILE | |||
| 295 | select ARCH_WANT_OPTIONAL_GPIOLIB | 297 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 296 | select NEED_MACH_IO_H if PCI | 298 | select NEED_MACH_IO_H if PCI |
| 297 | select PLAT_VERSATILE | 299 | select PLAT_VERSATILE |
| 300 | select PLAT_VERSATILE_CLOCK | ||
| 298 | select PLAT_VERSATILE_CLCD | 301 | select PLAT_VERSATILE_CLCD |
| 299 | select PLAT_VERSATILE_FPGA_IRQ | 302 | select PLAT_VERSATILE_FPGA_IRQ |
| 300 | select ARM_TIMER_SP804 | 303 | select ARM_TIMER_SP804 |
| @@ -314,6 +317,7 @@ config ARCH_VEXPRESS | |||
| 314 | select ICST | 317 | select ICST |
| 315 | select NO_IOPORT | 318 | select NO_IOPORT |
| 316 | select PLAT_VERSATILE | 319 | select PLAT_VERSATILE |
| 320 | select PLAT_VERSATILE_CLOCK | ||
| 317 | select PLAT_VERSATILE_CLCD | 321 | select PLAT_VERSATILE_CLCD |
| 318 | help | 322 | help |
| 319 | This enables support for the ARM Ltd Versatile Express boards. | 323 | This enables support for the ARM Ltd Versatile Express boards. |
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig index 81ee7cc34457..8d5c10a5084d 100644 --- a/arch/arm/plat-versatile/Kconfig +++ b/arch/arm/plat-versatile/Kconfig | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | if PLAT_VERSATILE | 1 | if PLAT_VERSATILE |
| 2 | 2 | ||
| 3 | config PLAT_VERSATILE_CLOCK | ||
| 4 | bool | ||
| 5 | |||
| 3 | config PLAT_VERSATILE_CLCD | 6 | config PLAT_VERSATILE_CLCD |
| 4 | bool | 7 | bool |
| 5 | 8 | ||
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index a5cb1945bdcc..272769a8a7d6 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-y := clock.o | 1 | obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o |
| 2 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o | 2 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o |
| 3 | obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o | 3 | obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o |
| 4 | obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o | 4 | obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o |