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

sh: tmu: Zap get_tbclk and timer_read_counter

Browse source 
Replace those two functions with generic ones by defining the
timer macros in include/config/*.h .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
This commit is contained in:
Marek Vasut 2018-08-24 21:52:53 +02:00 committed by Marek Vasut
parent f02c1f695e
commit 0e286c529f
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/sh/include/asm/config.h
View file

@ -6,4 +6,13 @@
#ifndef _ASM_CONFIG_H_ #ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
#if !defined(CONFIG_CPU_SH2)
#include <asm/processor.h>
/* Timer */
#define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0x8) /* TCNT0 */
#define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 4)
#endif
#endif #endif

16
arch/sh/lib/time.c
View file

@ -16,33 +16,17 @@
#if defined(CONFIG_CPU_SH3) #if defined(CONFIG_CPU_SH3)
#define TSTR 0x2 #define TSTR 0x2
#define TCNT0 0x8
#define TCR0 0xc #define TCR0 0xc
#endif /* CONFIG_CPU_SH3 */ #endif /* CONFIG_CPU_SH3 */
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE) #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE)
#define TSTR 0x4 #define TSTR 0x4
#define TCNT0 0xc
#define TCR0 0x10 #define TCR0 0x10
#endif /* CONFIG_CPU_SH4 */ #endif /* CONFIG_CPU_SH4 */
#define TCR_TPSC 0x07 #define TCR_TPSC 0x07
#define TSTR_STR0 BIT(0) #define TSTR_STR0 BIT(0)
unsigned long get_tbclk(void)
{
#ifdef CONFIG_RCAR_GEN2
return CONFIG_SYS_CLK_FREQ / 8;
#else
return CONFIG_SYS_CLK_FREQ / 4;
#endif
}
unsigned long timer_read_counter(void)
{
return ~readl(TMU_BASE + TCNT0);
}
int timer_init(void) int timer_init(void)
{ {
writew(readw(TMU_BASE + TCR0) & ~TCR_TPSC, TMU_BASE + TCR0); writew(readw(TMU_BASE + TCR0) & ~TCR_TPSC, TMU_BASE + TCR0);

3
include/configs/armadillo-800eva.h
View file

@ -18,6 +18,9 @@
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
#define CONFIG_TMU_TIMER #define CONFIG_TMU_TIMER
#define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */
#define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 4)
#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_DCACHE_OFF
/* STACK */ /* STACK */

7
include/configs/rcar-gen2-common.h
View file

@ -22,7 +22,6 @@
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
#define CONFIG_TMU_TIMER
#ifndef CONFIG_PINCTRL_PFC #ifndef CONFIG_PINCTRL_PFC
#define CONFIG_SH_GPIO_PFC #define CONFIG_SH_GPIO_PFC
#endif #endif
@ -57,4 +56,10 @@
#undef CONFIG_SPI_FLASH_MTD #undef CONFIG_SPI_FLASH_MTD
#endif #endif
/* Timer */
#define CONFIG_TMU_TIMER
#define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */
#define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 8)
#endif /* __RCAR_GEN2_COMMON_H */ #endif /* __RCAR_GEN2_COMMON_H */