Use available DM stm32_timer driver instead of dedicated mach-stm32/stm32fx/timer.c. Remove all defines or files previously used for timer usage in arch/arm/include/asm/arch-stm32fx and in arch/arm/mach-stm32/stm32fx Enable DM STM32_TIMER for STM32F4/F7 and H7. Signed-off-by: Patrice Chotard <patrice.chotard@st.com>master
Patrice Chotard
6 years ago
committed by
Tom Rini
parent
cd389c03f2
commit
aa5e3e22f4
@ -1,15 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved |
||||
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef __STM32_DEFS_H__ |
||||
#define __STM32_DEFS_H__ |
||||
#include <asm/arch/stm32_periph.h> |
||||
|
||||
int clock_setup(enum periph_clock); |
||||
|
||||
#endif |
||||
|
||||
@ -1,53 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved |
||||
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef _STM32_GPT_H |
||||
#define _STM32_GPT_H |
||||
|
||||
#include <asm/arch/stm32.h> |
||||
|
||||
struct gpt_regs { |
||||
u32 cr1; |
||||
u32 cr2; |
||||
u32 smcr; |
||||
u32 dier; |
||||
u32 sr; |
||||
u32 egr; |
||||
u32 ccmr1; |
||||
u32 ccmr2; |
||||
u32 ccer; |
||||
u32 cnt; |
||||
u32 psc; |
||||
u32 arr; |
||||
u32 reserved; |
||||
u32 ccr1; |
||||
u32 ccr2; |
||||
u32 ccr3; |
||||
u32 ccr4; |
||||
u32 reserved1; |
||||
u32 dcr; |
||||
u32 dmar; |
||||
u32 tim2_5_or; |
||||
}; |
||||
|
||||
struct gpt_regs *const gpt1_regs_ptr = |
||||
(struct gpt_regs *)TIM2_BASE; |
||||
|
||||
/* Timer control1 register */ |
||||
#define GPT_CR1_CEN BIT(0) |
||||
#define GPT_MODE_AUTO_RELOAD BIT(7) |
||||
|
||||
/* Auto reload register for free running config */ |
||||
#define GPT_FREE_RUNNING 0xFFFFFFFF |
||||
|
||||
/* Timer, HZ specific defines */ |
||||
#define CONFIG_STM32_HZ 1000 |
||||
|
||||
/* Timer Event Generation registers */ |
||||
#define TIM_EGR_UG BIT(0) |
||||
|
||||
#endif |
||||
@ -1,15 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved |
||||
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef __STM32_DEFS_H__ |
||||
#define __STM32_DEFS_H__ |
||||
#include <asm/arch/stm32_periph.h> |
||||
|
||||
int clock_setup(enum periph_clock); |
||||
|
||||
#endif |
||||
|
||||
@ -1,11 +0,0 @@ |
||||
#
|
||||
# (C) Copyright 2000-2006
|
||||
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
#
|
||||
# (C) Copyright 2015
|
||||
# Kamil Lulko, <kamil.lulko@gmail.com>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += timer.o
|
||||
@ -1,115 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2015 |
||||
* Kamil Lulko, <kamil.lulko@gmail.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <stm32_rcc.h> |
||||
#include <asm/io.h> |
||||
#include <asm/armv7m.h> |
||||
#include <asm/arch/stm32.h> |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
#define STM32_TIM2_BASE (STM32_APB1PERIPH_BASE + 0x0000) |
||||
|
||||
#define RCC_APB1ENR_TIM2EN (1 << 0) |
||||
|
||||
struct stm32_tim2_5 { |
||||
u32 cr1; |
||||
u32 cr2; |
||||
u32 smcr; |
||||
u32 dier; |
||||
u32 sr; |
||||
u32 egr; |
||||
u32 ccmr1; |
||||
u32 ccmr2; |
||||
u32 ccer; |
||||
u32 cnt; |
||||
u32 psc; |
||||
u32 arr; |
||||
u32 reserved1; |
||||
u32 ccr1; |
||||
u32 ccr2; |
||||
u32 ccr3; |
||||
u32 ccr4; |
||||
u32 reserved2; |
||||
u32 dcr; |
||||
u32 dmar; |
||||
u32 or; |
||||
}; |
||||
|
||||
#define TIM_CR1_CEN (1 << 0) |
||||
|
||||
#define TIM_EGR_UG (1 << 0) |
||||
|
||||
int timer_init(void) |
||||
{ |
||||
struct stm32_tim2_5 *tim = (struct stm32_tim2_5 *)STM32_TIM2_BASE; |
||||
|
||||
setbits_le32(&STM32_RCC->apb1enr, RCC_APB1ENR_TIM2EN); |
||||
|
||||
writel(((CONFIG_SYS_CLK_FREQ / 2) / CONFIG_SYS_HZ_CLOCK) - 1, |
||||
&tim->psc); |
||||
|
||||
writel(0xFFFFFFFF, &tim->arr); |
||||
writel(TIM_CR1_CEN, &tim->cr1); |
||||
setbits_le32(&tim->egr, TIM_EGR_UG); |
||||
|
||||
gd->arch.tbl = 0; |
||||
gd->arch.tbu = 0; |
||||
gd->arch.lastinc = 0; |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
ulong get_timer(ulong base) |
||||
{ |
||||
return (get_ticks() / (CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ)) - base; |
||||
} |
||||
|
||||
unsigned long long get_ticks(void) |
||||
{ |
||||
struct stm32_tim2_5 *tim = (struct stm32_tim2_5 *)STM32_TIM2_BASE; |
||||
u32 now; |
||||
|
||||
now = readl(&tim->cnt); |
||||
|
||||
if (now >= gd->arch.lastinc) |
||||
gd->arch.tbl += (now - gd->arch.lastinc); |
||||
else |
||||
gd->arch.tbl += (0xFFFFFFFF - gd->arch.lastinc) + now; |
||||
|
||||
gd->arch.lastinc = now; |
||||
|
||||
return gd->arch.tbl; |
||||
} |
||||
|
||||
void reset_timer(void) |
||||
{ |
||||
struct stm32_tim2_5 *tim = (struct stm32_tim2_5 *)STM32_TIM2_BASE; |
||||
|
||||
gd->arch.lastinc = readl(&tim->cnt); |
||||
gd->arch.tbl = 0; |
||||
} |
||||
|
||||
/* delay x useconds */ |
||||
void __udelay(ulong usec) |
||||
{ |
||||
unsigned long long start; |
||||
|
||||
start = get_ticks(); /* get current timestamp */ |
||||
while ((get_ticks() - start) < usec) |
||||
; /* loop till time has passed */ |
||||
} |
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency). |
||||
* On ARM it returns the number of timer ticks per second. |
||||
*/ |
||||
ulong get_tbclk(void) |
||||
{ |
||||
return CONFIG_SYS_HZ_CLOCK; |
||||
} |
||||
@ -1,8 +0,0 @@ |
||||
#
|
||||
# Copyright (C) 2016, STMicroelectronics - All Rights Reserved
|
||||
# Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += timer.o
|
||||
@ -1,113 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved |
||||
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <stm32_rcc.h> |
||||
#include <asm/io.h> |
||||
#include <asm/arch/stm32.h> |
||||
#include <asm/arch/stm32_defs.h> |
||||
#include <asm/arch/gpt.h> |
||||
|
||||
#define READ_TIMER() (readl(&gpt1_regs_ptr->cnt) & GPT_FREE_RUNNING) |
||||
#define GPT_RESOLUTION (CONFIG_SYS_HZ_CLOCK/CONFIG_STM32_HZ) |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
#define timestamp gd->arch.tbl |
||||
#define lastdec gd->arch.lastinc |
||||
|
||||
int timer_init(void) |
||||
{ |
||||
/* Timer2 clock configuration */ |
||||
clock_setup(TIMER2_CLOCK_CFG); |
||||
/* Stop the timer */ |
||||
writel(readl(&gpt1_regs_ptr->cr1) & ~GPT_CR1_CEN, &gpt1_regs_ptr->cr1); |
||||
|
||||
writel((CONFIG_SYS_CLK_FREQ / 2 / CONFIG_SYS_HZ_CLOCK) - 1, |
||||
&gpt1_regs_ptr->psc); |
||||
|
||||
/* Configure timer for auto-reload */ |
||||
writel(readl(&gpt1_regs_ptr->cr1) | GPT_MODE_AUTO_RELOAD, |
||||
&gpt1_regs_ptr->cr1); |
||||
|
||||
/* load value for free running */ |
||||
writel(GPT_FREE_RUNNING, &gpt1_regs_ptr->arr); |
||||
|
||||
/* start timer */ |
||||
writel(readl(&gpt1_regs_ptr->cr1) | GPT_CR1_CEN, &gpt1_regs_ptr->cr1); |
||||
|
||||
writel(readl(&gpt1_regs_ptr->egr) | TIM_EGR_UG, &gpt1_regs_ptr->egr); |
||||
|
||||
/* Reset the timer */ |
||||
lastdec = READ_TIMER(); |
||||
timestamp = 0; |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/*
|
||||
* timer without interrupts |
||||
*/ |
||||
ulong get_timer(ulong base) |
||||
{ |
||||
return (get_timer_masked() / GPT_RESOLUTION) - base; |
||||
} |
||||
|
||||
void __udelay(unsigned long usec) |
||||
{ |
||||
ulong tmo; |
||||
ulong start = get_timer_masked(); |
||||
ulong tenudelcnt = CONFIG_SYS_HZ_CLOCK / (1000 * 100); |
||||
ulong rndoff; |
||||
|
||||
rndoff = (usec % 10) ? 1 : 0; |
||||
|
||||
/* tenudelcnt timer tick gives 10 microsecconds delay */ |
||||
tmo = ((usec / 10) + rndoff) * tenudelcnt; |
||||
|
||||
while ((ulong) (get_timer_masked() - start) < tmo) |
||||
; |
||||
} |
||||
|
||||
ulong get_timer_masked(void) |
||||
{ |
||||
ulong now = READ_TIMER(); |
||||
|
||||
if (now >= lastdec) { |
||||
/* normal mode */ |
||||
timestamp += now - lastdec; |
||||
} else { |
||||
/* we have an overflow ... */ |
||||
timestamp += now + GPT_FREE_RUNNING - lastdec; |
||||
} |
||||
lastdec = now; |
||||
|
||||
return timestamp; |
||||
} |
||||
|
||||
void udelay_masked(unsigned long usec) |
||||
{ |
||||
return udelay(usec); |
||||
} |
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long). |
||||
* On ARM it just returns the timer value. |
||||
*/ |
||||
unsigned long long get_ticks(void) |
||||
{ |
||||
return get_timer(0); |
||||
} |
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency). |
||||
* On ARM it returns the number of timer ticks per second. |
||||
*/ |
||||
ulong get_tbclk(void) |
||||
{ |
||||
return CONFIG_STM32_HZ; |
||||
} |
||||
Loading…
Reference in new issue