diff options
| -rw-r--r-- | cpu/arm1136/omap24xx/interrupts.c | 2 | ||||
| -rw-r--r-- | cpu/arm925t/interrupts.c | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/omap/timer.c | 2 | ||||
| -rw-r--r-- | cpu/arm_cortexa8/omap3/interrupts.c | 2 | ||||
| -rw-r--r-- | include/configs/SX1.h | 6 | ||||
| -rw-r--r-- | include/configs/apollon.h | 6 | ||||
| -rw-r--r-- | include/configs/netstar.h | 4 | ||||
| -rw-r--r-- | include/configs/omap1510inn.h | 6 | ||||
| -rw-r--r-- | include/configs/omap1610h2.h | 4 | ||||
| -rw-r--r-- | include/configs/omap1610inn.h | 4 | ||||
| -rw-r--r-- | include/configs/omap2420h4.h | 10 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 6 | ||||
| -rw-r--r-- | include/configs/omap3_evm.h | 6 | ||||
| -rw-r--r-- | include/configs/omap3_overo.h | 6 | ||||
| -rw-r--r-- | include/configs/omap3_pandora.h | 6 | ||||
| -rw-r--r-- | include/configs/omap3_zoom1.h | 6 | ||||
| -rw-r--r-- | include/configs/omap5912osk.h | 4 | ||||
| -rw-r--r-- | include/configs/omap730p2.h | 7 | ||||
| -rw-r--r-- | include/configs/voiceblue.h | 6 | 
19 files changed, 41 insertions, 54 deletions
| diff --git a/cpu/arm1136/omap24xx/interrupts.c b/cpu/arm1136/omap24xx/interrupts.c index fb02a49be..6be1262f3 100644 --- a/cpu/arm1136/omap24xx/interrupts.c +++ b/cpu/arm1136/omap24xx/interrupts.c @@ -49,7 +49,7 @@ int interrupt_init (void)  	/* Start the counter ticking up */  	*((int32_t *) (CONFIG_SYS_TIMERBASE + TLDR)) = TIMER_LOAD_VAL;	/* reload value on overflow*/ -	val = (CONFIG_SYS_PVT << 2) | BIT5 | BIT1 | BIT0;		/* mask to enable timer*/ +	val = (CONFIG_SYS_PTV << 2) | BIT5 | BIT1 | BIT0;		/* mask to enable timer*/  	*((int32_t *) (CONFIG_SYS_TIMERBASE + TCLR)) = val;	/* start timer */  	reset_timer_masked(); /* init the timestamp and lastinc value */ diff --git a/cpu/arm925t/interrupts.c b/cpu/arm925t/interrupts.c index ce3c4ad76..361047bd2 100644 --- a/cpu/arm925t/interrupts.c +++ b/cpu/arm925t/interrupts.c @@ -51,7 +51,7 @@ int interrupt_init (void)  	/* Start the decrementer ticking down from 0xffffffff */  	*((int32_t *) (CONFIG_SYS_TIMERBASE + LOAD_TIM)) = TIMER_LOAD_VAL; -	val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PVT << MPUTIM_PTV_BIT); +	val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PTV << MPUTIM_PTV_BIT);  	*((int32_t *) (CONFIG_SYS_TIMERBASE + CNTL_TIMER)) = val;  	/* init the timestamp and lastdec value */ diff --git a/cpu/arm926ejs/omap/timer.c b/cpu/arm926ejs/omap/timer.c index 49e74abb3..bedc2e754 100644 --- a/cpu/arm926ejs/omap/timer.c +++ b/cpu/arm926ejs/omap/timer.c @@ -52,7 +52,7 @@ int timer_init (void)  	/* Start the decrementer ticking down from 0xffffffff */  	*((int32_t *) (CONFIG_SYS_TIMERBASE + LOAD_TIM)) = TIMER_LOAD_VAL; -	val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PVT << MPUTIM_PTV_BIT); +	val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PTV << MPUTIM_PTV_BIT);  	*((int32_t *) (CONFIG_SYS_TIMERBASE + CNTL_TIMER)) = val;  	/* init the timestamp and lastdec value */ diff --git a/cpu/arm_cortexa8/omap3/interrupts.c b/cpu/arm_cortexa8/omap3/interrupts.c index 9e9817de6..5d9c4e32c 100644 --- a/cpu/arm_cortexa8/omap3/interrupts.c +++ b/cpu/arm_cortexa8/omap3/interrupts.c @@ -175,7 +175,7 @@ int interrupt_init(void)  	/* start the counter ticking up, reload value on overflow */  	writel(TIMER_LOAD_VAL, &timer_base->tldr);  	/* enable timer */ -	writel((CONFIG_SYS_PVT << 2) | TCLR_PRE | TCLR_AR | TCLR_ST, +	writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST,  		&timer_base->tclr);  	reset_timer_masked();	/* init the timestamp and lastinc value */ diff --git a/include/configs/SX1.h b/include/configs/SX1.h index ebc823606..caa6592f7 100644 --- a/include/configs/SX1.h +++ b/include/configs/SX1.h @@ -138,9 +138,9 @@  /* The 1510 has 3 timers, they can be driven by the RefClk (12Mhz) or by DPLL1.   * This time is further subdivided by a local divisor.   */ -#define CONFIG_SYS_TIMERBASE	0xFFFEC500	    /* use timer 1 */ -#define CONFIG_SYS_PVT		7		    /* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_TIMERBASE	OMAP1510_TIMER1_BASE	/* use timer 1 */ +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/apollon.h b/include/configs/apollon.h index 97c8806e2..04da083e6 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -203,11 +203,9 @@   * or by 32KHz clk, or from external sig. This rate is divided by a local   * divisor.   */ -#define	V_PVT	7	/* use with 12MHz/128 */ -  #define	CONFIG_SYS_TIMERBASE	OMAP2420_GPT2 -#define	CONFIG_SYS_PVT	V_PVT	/* 2^(pvt+1) */ -#define	CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define	CONFIG_SYS_PTV		7	/* 2^(PTV+1) */ +#define	CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 1110eccb4..39560de3c 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -226,8 +226,8 @@   * This time is further subdivided by a local divisor.   */  #define CONFIG_SYS_TIMERBASE		OMAP1510_TIMER1_BASE -#define CONFIG_SYS_PVT			7		/* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7		/* 2^(pvt+1), divide by 256 */ +#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  #define OMAP5910_DPLL_DIV	1  #define OMAP5910_DPLL_MUL	((CONFIG_SYS_CLK_FREQ * \ diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index ac5040ab0..6c1c5ec0d 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -135,9 +135,9 @@  /* The 1510 has 3 timers, they can be driven by the RefClk (12Mhz) or by DPLL1.   * This time is further subdivided by a local divisor.   */ -#define CONFIG_SYS_TIMERBASE	0xFFFEC500	    /* use timer 1 */ -#define CONFIG_SYS_PVT		7		    /* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_TIMERBASE	OMAP1510_TIMER1_BASE	/* use timer 1 */ +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h index 79cf608b7..42e019831 100644 --- a/include/configs/omap1610h2.h +++ b/include/configs/omap1610h2.h @@ -131,8 +131,8 @@   * DPLL1. This time is further subdivided by a local divisor.   */  #define CONFIG_SYS_TIMERBASE	0xFFFEC500	/* use timer 1 */ -#define CONFIG_SYS_PVT	7	/* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ	((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h index ce30f55db..22c873e0c 100644 --- a/include/configs/omap1610inn.h +++ b/include/configs/omap1610inn.h @@ -136,8 +136,8 @@   * DPLL1. This time is further subdivided by a local divisor.   */  #define CONFIG_SYS_TIMERBASE	0xFFFEC500	/* use timer 1 */ -#define CONFIG_SYS_PVT	7	/* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ	((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index aa8232669..331bf4530 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -222,14 +222,14 @@   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */  #ifdef CONFIG_APTIX -#define V_PVT                    3 +#define V_PTV			3  #else -#define V_PVT                    7  /* use with 12MHz/128 */ +#define V_PTV			7	/* use with 12MHz/128 */  #endif -#define CONFIG_SYS_TIMERBASE            OMAP2420_GPT2 -#define CONFIG_SYS_PVT                  V_PVT  /* 2^(pvt+1) */ -#define CONFIG_SYS_HZ	                 ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_TIMERBASE		OMAP2420_GPT2 +#define CONFIG_SYS_PTV			V_PTV	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ad00b4c29..7db1eb754 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -226,11 +226,9 @@   * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */ -#define V_PVT				7 -  #define CONFIG_SYS_TIMERBASE		(OMAP34XX_GPT2) -#define CONFIG_SYS_PVT			V_PVT	/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index baf71f4f2..2f532d592 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -219,11 +219,9 @@   * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */ -#define V_PVT				7 -  #define CONFIG_SYS_TIMERBASE		OMAP34XX_GPT2 -#define CONFIG_SYS_PVT			V_PVT	/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 02d4fbc80..0c32100a0 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -213,11 +213,9 @@   * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */ -#define V_PVT				7 -  #define CONFIG_SYS_TIMERBASE		(OMAP34XX_GPT2) -#define CONFIG_SYS_PVT			V_PVT	/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 9a32452fb..fb4e50dbd 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -215,11 +215,9 @@   * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */ -#define V_PVT				7 -  #define CONFIG_SYS_TIMERBASE		(OMAP34XX_GPT2) -#define CONFIG_SYS_PVT			V_PVT	/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index b544ea11d..883234a50 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -223,11 +223,9 @@   * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by   * 32KHz clk, or from external sig. This rate is divided by a local divisor.   */ -#define V_PVT				7 -  #define CONFIG_SYS_TIMERBASE		(OMAP34XX_GPT2) -#define CONFIG_SYS_PVT			V_PVT	/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ			((V_SCLK) / (2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index 2bc53837d..d0ce9dc91 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -140,8 +140,8 @@   * DPLL1. This time is further subdivided by a local divisor.   */  #define CONFIG_SYS_TIMERBASE	0xFFFEC500	/* use timer 1 */ -#define CONFIG_SYS_PVT	7	/* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ	((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index 0b0d8b61d..32a9b2397 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -148,10 +148,9 @@   * the RefClk (12Mhz) or by DPLL1. This time is further subdivided by a   * local divisor.   */ - -#define CONFIG_SYS_TIMERBASE		   0xFFFEC500	       /* use timer 1 */ -#define CONFIG_SYS_PVT			   7		       /* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ			   ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_TIMERBASE		0xFFFEC500	/* use timer 1 */ +#define CONFIG_SYS_PTV			7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  /*-----------------------------------------------------------------------   * Stack sizes diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index b76c79466..3f9784372 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -213,9 +213,9 @@  /* The 1510 has 3 timers, they can be driven by the RefClk (12Mhz) or by DPLL1.   * This time is further subdivided by a local divisor.   */ -#define CONFIG_SYS_TIMERBASE		OMAP1510_TIMER1_BASE -#define CONFIG_SYS_PVT			7		/* 2^(pvt+1), divide by 256 */ -#define CONFIG_SYS_HZ			((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_TIMERBASE	OMAP1510_TIMER1_BASE +#define CONFIG_SYS_PTV		7	/* 2^(PTV+1), divide by 256 */ +#define CONFIG_SYS_HZ		((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))  #define OMAP5910_DPLL_DIV	1  #define OMAP5910_DPLL_MUL	((CONFIG_SYS_CLK_FREQ * \ |