Hello Fadil,
On Tue, Feb 12, 2013 at 5:46 PM, Fadil Berisha <f.kol...@gmail.com> wrote:
> From: Fadil Berisha <f.kol...@gmail.com>
>
> 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.kol...@gmail.com>
> ---
> arch/arm/cpu/arm926ejs/mxs/timer.c | 19 +++++-
> arch/arm/include/asm/arch-mxs/regs-timrot.h | 91
> +++++++++++++++++++++++++++
> 2 files changed, 108 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c
> b/arch/arm/cpu/arm926ejs/mxs/timer.c
> index 4ed75e6..a99b122 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
> @@ -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;
There're the MX28_INCREMENTER_HZ which should be renamed to MXS_INCREMENTER_HZ
> @@ -77,7 +81,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, HW_TIMROT_TIMCOUNT0);
> +#elif defined(CONFIG_MX28)
> writel(TIMER_LOAD_VAL, &timrot_regs->hw_timrot_fixed_count0);
> +#endif
>
> return 0;
> }
> @@ -86,9 +94,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 */
> + now = (readl(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) {
> /*
> diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h
> b/arch/arm/include/asm/arch-mxs/regs-timrot.h
> index 529a3bc..400259a 100644
> --- a/arch/arm/include/asm/arch-mxs/regs-timrot.h
> +++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h
You seem to have not updated the struct mxs_timrot_regs so the mapping
works for all registers of it.
> @@ -71,7 +71,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 +83,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 +105,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 +141,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 +160,29 @@ 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 HW_TIMROT_TIMCOUNT0 0x80068030
> +#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 +192,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 +211,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
Could you please take a look on this?
--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
