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

mxs: timrot: Add support to i.MX23

Browse source 
This patch add timer support to i.MX23 and complete bit fields and values
on regs-timrot.h.
Testet on imx23-olinuxino board.

Signed-off-by: Fadil Berisha <f.koliqi@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Fadil Berisha 2013-02-27 17:00:07 +00:00 committed by Stefano Babic
parent 36c7c9250d
commit 6ecd05d2f5
2 changed files with 122 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/cpu/arm926ejs/mxs/timer.c
View file

@ -32,7 +32,11 @@
#include <asm/arch/sys_proto.h>
/* Maximum fixed count */
#define TIMER_LOAD_VAL 0xffffffff
#if defined(CONFIG_MX23)
#define TIMER_LOAD_VAL 0xffff
#elif defined(CONFIG_MX28)
#define TIMER_LOAD_VAL 0xffffffff
#endif
DECLARE_GLOBAL_DATA_PTR;
@ -69,7 +73,11 @@ int timer_init(void)
mxs_reset_block(&timrot_regs->hw_timrot_rotctrl_reg);
/* Set fixed_count to 0 */
#if defined(CONFIG_MX23)
writel(0, &timrot_regs->hw_timrot_timcount0);
#elif defined(CONFIG_MX28)
writel(0, &timrot_regs->hw_timrot_fixed_count0);
#endif
/* Set UPDATE bit and 1Khz frequency */
writel(TIMROT_TIMCTRLn_UPDATE | TIMROT_TIMCTRLn_RELOAD |
@ -77,7 +85,11 @@ int timer_init(void)
&timrot_regs->hw_timrot_timctrl0);
/* Set fixed_count to maximal value */
#if defined(CONFIG_MX23)
writel(TIMER_LOAD_VAL - 1, &timrot_regs->hw_timrot_timcount0);
#elif defined(CONFIG_MX28)
writel(TIMER_LOAD_VAL, &timrot_regs->hw_timrot_fixed_count0);
#endif
return 0;
}
@ -86,9 +98,16 @@ unsigned long long get_ticks(void)
{
struct mxs_timrot_regs *timrot_regs =
(struct mxs_timrot_regs *)MXS_TIMROT_BASE;
uint32_t now;
/* Current tick value */
uint32_t now = readl(&timrot_regs->hw_timrot_running_count0);
#if defined(CONFIG_MX23)
/* Upper bits are the valid ones. */
now = readl(&timrot_regs->hw_timrot_timcount0) >>
TIMROT_RUNNING_COUNTn_RUNNING_COUNT_OFFSET;
#elif defined(CONFIG_MX28)
now = readl(&timrot_regs->hw_timrot_running_count0);
#endif
if (lastdec >= now) {
/*

101
arch/arm/include/asm/arch-mxs/regs-timrot.h
View file

@ -31,6 +31,16 @@
struct mxs_timrot_regs {
mxs_reg_32(hw_timrot_rotctrl)
mxs_reg_32(hw_timrot_rotcount)
#if defined(CONFIG_MX23)
mxs_reg_32(hw_timrot_timctrl0)
mxs_reg_32(hw_timrot_timcount0)
mxs_reg_32(hw_timrot_timctrl1)
mxs_reg_32(hw_timrot_timcount1)
mxs_reg_32(hw_timrot_timctrl2)
mxs_reg_32(hw_timrot_timcount2)
mxs_reg_32(hw_timrot_timctrl3)
mxs_reg_32(hw_timrot_timcount3)
#elif defined(CONFIG_MX28)
mxs_reg_32(hw_timrot_timctrl0)
mxs_reg_32(hw_timrot_running_count0)
mxs_reg_32(hw_timrot_fixed_count0)
@ -47,6 +57,7 @@ struct mxs_timrot_regs {
mxs_reg_32(hw_timrot_running_count3)
mxs_reg_32(hw_timrot_fixed_count3)
mxs_reg_32(hw_timrot_match_count3)
#endif
mxs_reg_32(hw_timrot_version)
};
#endif
@ -71,7 +82,11 @@ struct mxs_timrot_regs {
#define TIMROT_ROTCTRL_OVERSAMPLE_1X (0x3 << 10)
#define TIMROT_ROTCTRL_POLARITY_B (1 << 9)
#define TIMROT_ROTCTRL_POLARITY_A (1 << 8)
#if defined(CONFIG_MX23)
#define TIMROT_ROTCTRL_SELECT_B_MASK (0x7 << 4)
#elif defined(CONFIG_MX28)
#define TIMROT_ROTCTRL_SELECT_B_MASK (0xf << 4)
#endif
#define TIMROT_ROTCTRL_SELECT_B_OFFSET 4
#define TIMROT_ROTCTRL_SELECT_B_NEVER_TICK (0x0 << 4)
#define TIMROT_ROTCTRL_SELECT_B_PWM0 (0x1 << 4)
@ -79,12 +94,21 @@ struct mxs_timrot_regs {
#define TIMROT_ROTCTRL_SELECT_B_PWM2 (0x3 << 4)
#define TIMROT_ROTCTRL_SELECT_B_PWM3 (0x4 << 4)
#define TIMROT_ROTCTRL_SELECT_B_PWM4 (0x5 << 4)
#if defined(CONFIG_MX23)
#define TIMROT_ROTCTRL_SELECT_B_ROTARYA (0x6 << 4)
#define TIMROT_ROTCTRL_SELECT_B_ROTARYB (0x7 << 4)
#elif defined(CONFIG_MX28)
#define TIMROT_ROTCTRL_SELECT_B_PWM5 (0x6 << 4)
#define TIMROT_ROTCTRL_SELECT_B_PWM6 (0x7 << 4)
#define TIMROT_ROTCTRL_SELECT_B_PWM7 (0x8 << 4)
#define TIMROT_ROTCTRL_SELECT_B_ROTARYA (0x9 << 4)
#define TIMROT_ROTCTRL_SELECT_B_ROTARYB (0xa << 4)
#endif
#if defined(CONFIG_MX23)
#define TIMROT_ROTCTRL_SELECT_A_MASK 0x7
#elif defined(CONFIG_MX28)
#define TIMROT_ROTCTRL_SELECT_A_MASK 0xf
#endif
#define TIMROT_ROTCTRL_SELECT_A_OFFSET 0
#define TIMROT_ROTCTRL_SELECT_A_NEVER_TICK 0x0
#define TIMROT_ROTCTRL_SELECT_A_PWM0 0x1
@ -92,18 +116,25 @@ struct mxs_timrot_regs {
#define TIMROT_ROTCTRL_SELECT_A_PWM2 0x3
#define TIMROT_ROTCTRL_SELECT_A_PWM3 0x4
#define TIMROT_ROTCTRL_SELECT_A_PWM4 0x5
#if defined(CONFIG_MX23)
#define TIMROT_ROTCTRL_SELECT_A_ROTARYA 0x6
#define TIMROT_ROTCTRL_SELECT_A_ROTARYB 0x7
#elif defined(CONFIG_MX28)
#define TIMROT_ROTCTRL_SELECT_A_PWM5 0x6
#define TIMROT_ROTCTRL_SELECT_A_PWM6 0x7
#define TIMROT_ROTCTRL_SELECT_A_PWM7 0x8
#define TIMROT_ROTCTRL_SELECT_A_ROTARYA 0x9
#define TIMROT_ROTCTRL_SELECT_A_ROTARYB 0xa
#endif
#define TIMROT_ROTCOUNT_UPDOWN_MASK 0xffff
#define TIMROT_ROTCOUNT_UPDOWN_OFFSET 0
#define TIMROT_TIMCTRLn_IRQ (1 << 15)
#define TIMROT_TIMCTRLn_IRQ_EN (1 << 14)
#if defined(CONFIG_MX28)
#define TIMROT_TIMCTRLn_MATCH_MODE (1 << 11)
#endif
#define TIMROT_TIMCTRLn_POLARITY (1 << 8)
#define TIMROT_TIMCTRLn_UPDATE (1 << 7)
#define TIMROT_TIMCTRLn_RELOAD (1 << 6)
@ -121,6 +152,15 @@ struct mxs_timrot_regs {
#define TIMROT_TIMCTRLn_SELECT_PWM2 0x3
#define TIMROT_TIMCTRLn_SELECT_PWM3 0x4
#define TIMROT_TIMCTRLn_SELECT_PWM4 0x5
#if defined(CONFIG_MX23)
#define TIMROT_TIMCTRLn_SELECT_ROTARYA 0x6
#define TIMROT_TIMCTRLn_SELECT_ROTARYB 0x7
#define TIMROT_TIMCTRLn_SELECT_32KHZ_XTAL 0x8
#define TIMROT_TIMCTRLn_SELECT_8KHZ_XTAL 0x9
#define TIMROT_TIMCTRLn_SELECT_4KHZ_XTAL 0xa
#define TIMROT_TIMCTRLn_SELECT_1KHZ_XTAL 0xb
#define TIMROT_TIMCTRLn_SELECT_TICK_ALWAYS 0xc
#elif defined(CONFIG_MX28)
#define TIMROT_TIMCTRLn_SELECT_PWM5 0x6
#define TIMROT_TIMCTRLn_SELECT_PWM6 0x7
#define TIMROT_TIMCTRLn_SELECT_PWM7 0x8
@ -131,15 +171,28 @@ struct mxs_timrot_regs {
#define TIMROT_TIMCTRLn_SELECT_4KHZ_XTAL 0xd
#define TIMROT_TIMCTRLn_SELECT_1KHZ_XTAL 0xe
#define TIMROT_TIMCTRLn_SELECT_TICK_ALWAYS 0xf
#endif
#if defined(CONFIG_MX23)
#define TIMROT_RUNNING_COUNTn_RUNNING_COUNT_MASK (0xffff << 16)
#define TIMROT_RUNNING_COUNTn_RUNNING_COUNT_OFFSET 16
#elif defined(CONFIG_MX28)
#define TIMROT_RUNNING_COUNTn_RUNNING_COUNT_MASK 0xffffffff
#define TIMROT_RUNNING_COUNTn_RUNNING_COUNT_OFFSET 0
#endif
#if defined(CONFIG_MX23)
#define TIMROT_FIXED_COUNTn_FIXED_COUNT_MASK 0xffff
#define TIMROT_FIXED_COUNTn_FIXED_COUNT_OFFSET 0
#elif defined(CONFIG_MX28)
#define TIMROT_FIXED_COUNTn_FIXED_COUNT_MASK 0xffffffff
#define TIMROT_FIXED_COUNTn_FIXED_COUNT_OFFSET 0
#endif
#if defined(CONFIG_MX28)
#define TIMROT_MATCH_COUNTn_MATCH_COUNT_MASK 0xffffffff
#define TIMROT_MATCH_COUNTn_MATCH_COUNT_OFFSET 0
#endif
#define TIMROT_TIMCTRL3_TEST_SIGNAL_MASK (0xf << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_OFFSET 16
@ -149,6 +202,15 @@ struct mxs_timrot_regs {
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM2 (0x3 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM3 (0x4 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM4 (0x5 << 16)
#if defined(CONFIG_MX23)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_ROTARYA (0x6 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_ROTARYB (0x7 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_32KHZ_XTAL (0x8 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_8KHZ_XTAL (0x9 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_4KHZ_XTAL (0xa << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_1KHZ_XTAL (0xb << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_TICK_ALWAYS (0xc << 16)
#elif defined(CONFIG_MX28)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM5 (0x6 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM6 (0x7 << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_PWM7 (0x8 << 16)
@ -159,7 +221,46 @@ struct mxs_timrot_regs {
#define TIMROT_TIMCTRL3_TEST_SIGNAL_4KHZ_XTAL (0xd << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_1KHZ_XTAL (0xe << 16)
#define TIMROT_TIMCTRL3_TEST_SIGNAL_TICK_ALWAYS (0xf << 16)
#endif
#if defined(CONFIG_MX23)
#define TIMROT_TIMCTRL3_IRQ (1 << 15)
#define TIMROT_TIMCTRL3_IRQ_EN (1 << 14)
#define TIMROT_TIMCTRL3_DUTU_VALID (1 << 10)
#endif
#define TIMROT_TIMCTRL3_DUTY_CYCLE (1 << 9)
#if defined(CONFIG_MX23)
#define TIMROT_TIMCTRL3_POLARITY_MASK (0x1 << 8)
#define TIMROT_TIMCTRL3_POLARITY_OFFSET 8
#define TIMROT_TIMCTRL3_POLARITY_POSITIVE (0x0 << 8)
#define TIMROT_TIMCTRL3_POLARITY_NEGATIVE (0x1 << 8)
#define TIMROT_TIMCTRL3_UPDATE (1 << 7)
#define TIMROT_TIMCTRL3_RELOAD (1 << 6)
#define TIMROT_TIMCTRL3_PRESCALE_MASK (0x3 << 4)
#define TIMROT_TIMCTRL3_PRESCALE_OFFSET 4
#define TIMROT_TIMCTRL3_PRESCALE_DIV_BY_1 (0x0 << 4)
#define TIMROT_TIMCTRL3_PRESCALE_DIV_BY_2 (0x1 << 4)
#define TIMROT_TIMCTRL3_PRESCALE_DIV_BY_4 (0x2 << 4)
#define TIMROT_TIMCTRL3_PRESCALE_DIV_BY_8 (0x3 << 4)
#define TIMROT_TIMCTRL3_SELECT_MASK 0xf
#define TIMROT_TIMCTRL3_SELECT_OFFSET 0
#define TIMROT_TIMCTRL3_SELECT_NEVER_TICK 0x0
#define TIMROT_TIMCTRL3_SELECT_PWM0 0x1
#define TIMROT_TIMCTRL3_SELECT_PWM1 0x2
#define TIMROT_TIMCTRL3_SELECT_PWM2 0x3
#define TIMROT_TIMCTRL3_SELECT_PWM3 0x4
#define TIMROT_TIMCTRL3_SELECT_PWM4 0x5
#define TIMROT_TIMCTRL3_SELECT_ROTARYA 0x6
#define TIMROT_TIMCTRL3_SELECT_ROTARYB 0x7
#define TIMROT_TIMCTRL3_SELECT_32KHZ_XTAL 0x8
#define TIMROT_TIMCTRL3_SELECT_8KHZ_XTAL 0x9
#define TIMROT_TIMCTRL3_SELECT_4KHZ_XTAL 0xa
#define TIMROT_TIMCTRL3_SELECT_1KHZ_XTAL 0xb
#define TIMROT_TIMCTRL3_SELECT_TICK_ALWAYS 0xc
#define TIMROT_TIMCOUNT3_LOW_RUNNING_COUNT_MASK (0xffff << 16)
#define TIMROT_TIMCOUNT3_LOW_RUNNING_COUNT_OFFSET 16
#define TIMROT_TIMCOUNT3_HIGH_FIXED_COUNT_MASK 0xffff
#define TIMROT_TIMCOUNT3_HIGH_FIXED_COUNT_OFFSET 0
#endif
#define TIMROT_VERSION_MAJOR_MASK (0xff << 24)
#define TIMROT_VERSION_MAJOR_OFFSET 24