diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 13:51:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 13:51:08 -0800 |
| commit | 8f4f2721ddc85a78e6a05c2d35953a351992d5dc (patch) | |
| tree | dfc44e14e7071a6fce6f9e6bae47a201ffbc0930 | |
| parent | efdda175c07f34d4c8dd38bf23be8d15ef37e32e (diff) | |
| parent | c840f28bbf643c361c463bcb8fb815d0b2dad4e8 (diff) | |
Merge tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/arm64
Enable the rockchip-specific timers on arm64 rockchip platforms.
The driver got reworked to not use arm32-specific dsb calls in
4.5-rc1, so now we can safely enable it.
* tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: Enable the timer on Rockchip architecture
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 21074f674bde..8a0952275291 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -60,6 +60,7 @@ config ARCH_ROCKCHIP select ARCH_REQUIRE_GPIOLIB select PINCTRL select PINCTRL_ROCKCHIP + select ROCKCHIP_TIMER help This enables support for the ARMv8 based Rockchip chipsets, like the RK3368. |