diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-09-04 15:13:27 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-04 15:13:48 +0200 |
commit | cc1770a65e1685e9febdc0ddc4ca97e7effd70ad (patch) | |
tree | d94f4415b6fa078534772fb186a9f453b28343b5 /arch/arm/Kconfig | |
parent | 9e38081e5deb9c6cb7a7949b4f12959ea3ca8663 (diff) | |
parent | 93eae12c9f3e3bf423b308b341d380b0b4291bf8 (diff) | |
download | linux-stable-cc1770a65e1685e9febdc0ddc4ca97e7effd70ad.tar.gz linux-stable-cc1770a65e1685e9febdc0ddc4ca97e7effd70ad.tar.bz2 linux-stable-cc1770a65e1685e9febdc0ddc4ca97e7effd70ad.zip |
Merge tag 'davinci-for-v5.4/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/soc
This converts all DaVinci SoCs except DM365 to use new clocksource
driver. DM365 conversion is still under debug and will be part of a
future pull request.
* tag 'davinci-for-v5.4/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: dm646x: Fix a typo in the comment
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: move timer definitions to davinci.h
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: WARN_ON() if clk_get() fails
ARM: davinci: enable the clocksource driver for DT mode
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1086a0e8083e..14a3104243fd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -514,6 +514,7 @@ config ARCH_DAVINCI select ARCH_HAS_HOLES_MEMORYMODEL select COMMON_CLK select CPU_ARM926T + select DAVINCI_TIMER select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP |