summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rockchip
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-09-09 17:34:41 +0200
committerRussell King <rmk+kernel@armlinux.org.uk>2017-09-09 17:34:41 +0200
commite558bdc21ae1f0db520eccd84015e17d8a589973 (patch)
treeb436123bd52f267b8c7f361618cded3e1e4421ea /arch/arm/mach-rockchip
parentARM: 8692/1: mm: abort uaccess retries upon fatal signal (diff)
parentARM: 8691/1: Export save_stack_trace_tsk() (diff)
downloadlinux-e558bdc21ae1f0db520eccd84015e17d8a589973.tar.xz
linux-e558bdc21ae1f0db520eccd84015e17d8a589973.zip
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/mach-rockchip')
-rw-r--r--arch/arm/mach-rockchip/rockchip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index ef0500a4c8ad..e41cabc4dc2b 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -55,7 +55,7 @@ static void __init rockchip_timer_init(void)
}
of_clk_init(NULL);
- clocksource_probe();
+ timer_probe();
}
static void __init rockchip_dt_init(void)
@@ -70,6 +70,7 @@ static const char * const rockchip_board_dt_compat[] = {
"rockchip,rk3188",
"rockchip,rk3228",
"rockchip,rk3288",
+ "rockchip,rv1108",
NULL,
};