Commit fd9e0fe0 authored by Kever Yang's avatar Kever Yang Committed by Philipp Tomsich
Browse files

rockchip: rk3188: use DM timer instead of rk_timer



Disable rk_timer as SYS timer and use DM timer instead,
so that we can get a better timer framework, the rk_timer
is going to be clean after we conver to use DM timer or
ARM arch/generic timer.
Signed-off-by: Kever Yang's avatarKever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich's avatarPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich's avatarPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
parent f9ef5447
...@@ -40,8 +40,10 @@ endif ...@@ -40,8 +40,10 @@ endif
obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o
ifndef CONFIG_ARM64 ifndef CONFIG_ARM64
ifndef CONFIG_ROCKCHIP_RK3188
obj-y += rk_timer.o obj-y += rk_timer.o
endif endif
endif
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/ obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/
......
...@@ -131,8 +131,6 @@ void board_init_f(ulong dummy) ...@@ -131,8 +131,6 @@ void board_init_f(ulong dummy)
hang(); hang();
} }
rockchip_timer_init();
ret = rockchip_get_clk(&dev); ret = rockchip_get_clk(&dev);
if (ret) { if (ret) {
debug("CLK init failed: %d\n", ret); debug("CLK init failed: %d\n", ret);
......
...@@ -5,6 +5,9 @@ CONFIG_ARCH_ROCKCHIP=y ...@@ -5,6 +5,9 @@ CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_SYS_TEXT_BASE=0x60000000
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ROCKCHIP_RK3188=y CONFIG_ROCKCHIP_RK3188=y
CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ROCKCHIP_TIMER=y
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
CONFIG_TARGET_ROCK=y CONFIG_TARGET_ROCK=y
CONFIG_SPL_STACK_R_ADDR=0x60080000 CONFIG_SPL_STACK_R_ADDR=0x60080000
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
#define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000)
#define CONFIG_SYS_TIMER_BASE 0x2000e000 /* TIMER3 */
#define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8)
#define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_MEM32
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment