aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rockchip
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-06-28 14:13:42 -0400
committerHeiko Stuebner <heiko@sntech.de>2014-07-26 07:07:19 -0400
commit7a1917abdd428a6c9f6bf261306d069320e502b5 (patch)
treeb1d0886fb2e18c0aac23f47535f84480efb07d73 /arch/arm/mach-rockchip
parent7b5da4c3b9c6ef8d7cd7635b839adfb836edb08a (diff)
ARM: rockchip: enable support for RK3288 SoCs
Enable HAVE_ARM_ARCH_TIMER and add a rockchip,rk3288 compatible. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-rockchip')
-rw-r--r--arch/arm/mach-rockchip/Kconfig1
-rw-r--r--arch/arm/mach-rockchip/rockchip.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index e4564c259ed1..d1686696ca41 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -6,6 +6,7 @@ config ARCH_ROCKCHIP
6 select ARCH_REQUIRE_GPIOLIB 6 select ARCH_REQUIRE_GPIOLIB
7 select ARM_GIC 7 select ARM_GIC
8 select CACHE_L2X0 8 select CACHE_L2X0
9 select HAVE_ARM_ARCH_TIMER
9 select HAVE_ARM_SCU if SMP 10 select HAVE_ARM_SCU if SMP
10 select HAVE_ARM_TWD if SMP 11 select HAVE_ARM_TWD if SMP
11 select DW_APB_TIMER_OF 12 select DW_APB_TIMER_OF
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index 968cc348e624..8ab9e0e7ff04 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -29,6 +29,7 @@ static const char * const rockchip_board_dt_compat[] = {
29 "rockchip,rk3066a", 29 "rockchip,rk3066a",
30 "rockchip,rk3066b", 30 "rockchip,rk3066b",
31 "rockchip,rk3188", 31 "rockchip,rk3188",
32 "rockchip,rk3288",
32 NULL, 33 NULL,
33}; 34};
34 35