Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

rockchip: timer: make register sizes explicit

Browse source 
We are about to reuse the rockchip timer (header file) for 64bit ARMv8
chips, so it seems a good time to make the register sizes explicit by
changing from 'unsigned int' to 'u32'.

Reorders the header-includes in rk_timer.c to ensure that 'u32' is
definded before it is used by 'asm/arch/timer.h'.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Philipp Tomsich 2017-07-14 18:09:25 +02:00
parent 0124062853
commit cb91173a7f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/include/asm/arch-rockchip/timer.h
View file

@ -8,12 +8,12 @@
#define __ASM_ARCH_TIMER_H
struct rk_timer {
unsigned int timer_load_count0;
unsigned int timer_load_count1;
unsigned int timer_curr_value0;
unsigned int timer_curr_value1;
unsigned int timer_ctrl_reg;
unsigned int timer_int_status;
u32 timer_load_count0;
u32 timer_load_count1;
u32 timer_curr_value0;
u32 timer_curr_value1;
u32 timer_ctrl_reg;
u32 timer_int_status;
};
void rockchip_timer_init(void);

2
arch/arm/mach-rockchip/rk_timer.c
View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/arch/timer.h>
#include <asm/io.h>
#include <common.h>
#include <linux/types.h>
struct rk_timer * const timer_ptr = (void *)CONFIG_SYS_TIMER_BASE;