diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-23 21:51:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-23 21:51:39 -0700 |
| commit | db404e72bb5432c886ff0ea42e7b31d16be0c837 (patch) | |
| tree | 91cf9618fa0b5233115abe6863d2f8a36390c050 /arch/arm/Kconfig | |
| parent | 40169a7c399346281da55ed9905a104d3da47945 (diff) | |
| parent | e9a91de7602a0a6999f23a2981db68b69aa695a7 (diff) | |
| download | blackbird-op-linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.tar.gz blackbird-op-linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.zip | |
Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt
From Tony Prisk:
Update arch-vt8500 and drivers to device tree and
remove existing non-dt code.
* tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code:
arm: vt8500: Update arch-vt8500 to devicetree support.
arm: vt8500: gpio: Devicetree support for arch-vt8500
arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
arm: vt8500: clk: Add Common Clock Framework support
video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
serial: vt8500: Add devicetree support for vt8500-serial
rtc: vt8500: Add devicetree support for vt8500-rtc
arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
Resolved add/change conflict in drivers/clk/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index de325f4615bd..1fd9bcd25b4d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1004,6 +1004,10 @@ config ARCH_VT8500 select ARCH_HAS_CPUFREQ select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB + select USE_OF + select COMMON_CLK + select HAVE_CLK + select CLKDEV_LOOKUP help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. @@ -1128,8 +1132,6 @@ source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" -source "arch/arm/mach-vt8500/Kconfig" - source "arch/arm/mach-w90x900/Kconfig" # Definitions to make life easier @@ -1622,6 +1624,7 @@ config ARCH_NR_GPIO default 355 if ARCH_U8500 default 264 if MACH_H4700 default 512 if SOC_OMAP5 + default 288 if ARCH_VT8500 default 0 help Maximum number of GPIOs in the system. |
