[U-Boot] [U-Boot, 3/8] rockchip: rk322x: use ARM arch timer instead of rk_timer

[Philipp Tomsich]

On Wed, 18 Apr 2018, Kever Yang wrote:

> We prefer to use ARM arch timer instead of rockchip timer, so that
> we are using the same timer for SPL, U-Boot and Kernel, which will
> make things simple and easy to track to boot time.
>
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>

See below for requested changes.

> ---
>
> arch/arm/mach-rockchip/Makefile           |  2 +-
> arch/arm/mach-rockchip/rk322x-board-spl.c | 19 ++++++++++++++++---
> include/configs/rk322x_common.h           |  6 +++---
> 3 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index 096dbac..c1eeefb 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -40,7 +40,7 @@ endif
> obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o
>
> ifndef CONFIG_ARM64
> -ifndef CONFIG_ROCKCHIP_RK3188
> +ifeq ($(CONFIG_ROCKCHIP_RK3188)$(CONFIG_ROCKCHIP_RK322X),)

Please have a config-option for the rk_timer and force (i.e. SELECT) it 
for these chips. I am not keen on a list that grows like this...

> obj-y += rk_timer.o
> endif
> endif
> diff --git a/arch/arm/mach-rockchip/rk322x-board-spl.c b/arch/arm/mach-rockchip/rk322x-board-spl.c
> index d3d0446..b5b178f 100644
> --- a/arch/arm/mach-rockchip/rk322x-board-spl.c
> +++ b/arch/arm/mach-rockchip/rk322x-board-spl.c
> @@ -14,7 +14,6 @@
> #include <asm/arch/cru_rk322x.h>
> #include <asm/arch/grf_rk322x.h>
> #include <asm/arch/hardware.h>
> -#include <asm/arch/timer.h>
> #include <asm/arch/uart.h>
>
> u32 spl_boot_device(void)
> @@ -62,6 +61,17 @@ void board_debug_uart_init(void)
> 		     CON_IOMUX_UART2SEL_21 << CON_IOMUX_UART2SEL_SHIFT);
> }
>
> +void rockchip_stimer_init(void)
> +{
> +	asm volatile("mcr p15, 0, %0, c14, c0, 0"
> +		     : : "r"(COUNTER_FREQUENCY));
> +
> +	writel(0, CONFIG_ROCKCHIP_STIMER_BASE + 0x10);
> +	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE);
> +	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 4);
> +	writel(1, CONFIG_ROCKCHIP_STIMER_BASE + 0x10);
> +}

NAK. See comment on patch #1.

> +
> #define SGRF_DDR_CON0 0x10150000

Can we have this as a const uint32_t * ?

> void board_init_f(ulong dummy)
> {
> @@ -85,8 +95,11 @@ void board_init_f(ulong dummy)
> 		hang();
> 	}
>
> -	rockchip_timer_init();
> -	printf("timer init done\n");
> +	/* Init secure timer */
> +	rockchip_stimer_init();
> +	/* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */
> +	timer_init();
> +
> 	ret = uclass_get_device(UCLASS_RAM, 0, &dev);
> 	if (ret) {
> 		printf("DRAM init failed: %d\n", ret);
> diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
> index b437b85..8f8a1ef 100644
> --- a/include/configs/rk322x_common.h
> +++ b/include/configs/rk322x_common.h
> @@ -14,9 +14,9 @@
> #define CONFIG_SYS_CBSIZE		1024
> #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/*  64M */
>
> -#define CONFIG_SYS_TIMER_RATE		(24 * 1000 * 1000)
> -#define CONFIG_SYS_TIMER_BASE		0x110c00a0 /* TIMER5 */
> -#define CONFIG_SYS_TIMER_COUNTER	(CONFIG_SYS_TIMER_BASE + 8)
> +#define COUNTER_FREQUENCY		24000000
> +#define CONFIG_SYS_ARCH_TIMER
> +#define CONFIG_SYS_HZ_CLOCK		24000000
>
> #define CONFIG_SYS_NS16550_MEM32
> #define CONFIG_SYS_INIT_SP_ADDR		0x60100000
>