Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f4f2721 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.6-rockchip-soc64-1' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents efdda175 c840f28b

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -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.