arm: omap2plus: Move CONFIG_SYS_PTV out of CONFIG namespace

This is always defined to 2, and referenced in two places.  Move the
define to <asm/omap_common.h> and make sure the code that uses this
includes that file.  Make <asm/arch-omap*/clock.h> not include that
file, as we don't need to be doing so.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h
index 0a626fe647a293584dcb909d42fc0829511c96d9..4054dd8edcbc734837013201dbc100aa8d324ba6 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/clock.h
+++ b/arch/arm/include/asm/arch-omap4/clock.h
@@ -7,7 +7,6 @@
  */
 #ifndef _CLOCKS_OMAP4_H_
 #define _CLOCKS_OMAP4_H_
-#include <asm/omap_common.h>
 
 /*
  * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per

diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
index a00626e357c960224e39636d75aa62331122431e..b18ef459decc48a48eda45d97937fd48c9babaef 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/clock.h
+++ b/arch/arm/include/asm/arch-omap5/clock.h
@@ -8,7 +8,6 @@
  */
 #ifndef _CLOCKS_OMAP5_H_
 #define _CLOCKS_OMAP5_H_
-#include <asm/omap_common.h>
 
 /*
  * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per

diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 264a2e717a7028f1a2a77aa3b66062079420847f..17fdfbcffb7aee5fb1ae89d1724fae0e85ac6643 100644 (file)
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -13,6 +13,7 @@
 #include <linux/types.h>
 
 #define NUM_SYS_CLKS   7
+#define SYS_PTV                2       /* Divisor: 2^(PTV+1) => 8 */
 
 struct bd_info;
 

diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 4672dc534c5efbbef5d9ebb4afee2365b0a9b60d..53c39ce1fb6899d2c86992edf129d8e77ec87f0c 100644 (file)
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sata.h>
 #include <sata.h>
 #include <asm/io.h>
+#include <asm/omap_common.h>
 #include "pipe3-phy.h"
 
 static struct pipe3_dpll_map dpll_map_sata[] = {

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 82b10f6b2487c213b2b85177ef8777db098919b9..00d91c10136d98f1915e977cae512e226d597932 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
+#include <asm/omap_common.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -33,7 +34,7 @@ static ulong get_timer_masked(void);
  * Nothing really to do with interrupts, just starts up a counter.
  */
 
-#define TIMER_CLOCK            (V_SCLK / (2 << CONFIG_SYS_PTV))
+#define TIMER_CLOCK            (V_SCLK / (2 << SYS_PTV))
 #define TIMER_OVERFLOW_VAL     0xffffffff
 #define TIMER_LOAD_VAL         0
 
@@ -42,7 +43,7 @@ int timer_init(void)
        /* start the counter ticking up, reload value on overflow */
        writel(TIMER_LOAD_VAL, &timer_base->tldr);
        /* enable timer */
-       writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST,
+       writel((SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST,
                &timer_base->tclr);
 
        return 0;

diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index 25a6108fef2cbc24138fd1c4082e1c5e7577d809..aa2e4360c1bb31f626306c7a9cfd6561bd0f3793 100644 (file)
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -11,6 +11,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/omap_common.h>
 #include <linux/bitops.h>
 
 /* Timer register bits */
@@ -61,13 +62,13 @@ static int omap_timer_probe(struct udevice *dev)
        if (!uc_priv->clock_rate)
                uc_priv->clock_rate = V_SCLK;
 
-       uc_priv->clock_rate /= (2 << CONFIG_SYS_PTV);
+       uc_priv->clock_rate /= (2 << SYS_PTV);
 
        /* start the counter ticking up, reload value on overflow */
        writel(0, &priv->regs->tldr);
        writel(0, &priv->regs->tcrr);
        /* enable timer */
-       writel((CONFIG_SYS_PTV << 2) | TCLR_PRE_EN | TCLR_AUTO_RELOAD |
+       writel((SYS_PTV << 2) | TCLR_PRE_EN | TCLR_AUTO_RELOAD |
               TCLR_START, &priv->regs->tclr);
 
        return 0;

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 5fc8ce622b1f54ec0cb229d551111952cff82b79..1c3c86eb59f79dbfcf4e50fa50bca4afec4fbd76 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -24,7 +24,6 @@
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 /* Timer information */
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index f273e243e55df79e138ade9ea566c848332b911f..f33dd19ea367b5d7d6228fa5db28033bb660a78e 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -153,7 +153,6 @@
  * This rate is divided by a local divisor.
  */
 #define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /*
  * Physical Memory Map

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 322fd24302fa5d9aef46d19057514b71e111c712..2b4d05b7165b2ef94b8f651214cac3a0bd2b64bc 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -42,7 +42,6 @@
                                                GENERATED_GBL_DATA_SIZE)
  /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_SERIAL

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 2a2609d9668dd224a553d5c92b7b8b9806944a52..2daaadd3146e1878eb97ff2d6d38e562a8c6da55 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -16,7 +16,6 @@
  */
 
 #define CONFIG_SYS_TIMERBASE   OMAP34XX_GPT2
-#define CONFIG_SYS_PTV         2
 
 #define V_NS16550_CLK          48000000
 #define V_OSCK                 26000000

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 3ce2c1fdc0aa94189ffc5f98eec62cc0a7548173..ff5bbad90e79b3882ab8427a114f5bcbb3981a7c 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -77,7 +77,6 @@
  * Platform/Board specific defs
  */
 #define CONFIG_SYS_TIMERBASE           0x4802E000
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_SERIAL

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index c2dfdebcd5b6a9ba5bed923459178b8a7f0d8bd8..ba3bc43aa0e7363bc5089b697dc0bd3e04389ce5 100644 (file)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -28,7 +28,6 @@
  * Platform/Board specific defs
  */
 #define CONFIG_SYS_TIMERBASE    0x4802E000
-#define CONFIG_SYS_PTV          2   /* Divisor: 2^(PTV+1) => 8 */
 
 /*
  * NS16550 Configuration

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 90dfb1feeb7d0f49bff342f5ad95ed8cabdc218f..cd136f696a4749a438b451460e6b697ce3383845 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -71,9 +71,6 @@
                                                GENERATED_GBL_DATA_SIZE)
 #endif
 
-/* Timer information. */
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
-
 /* If DM_I2C, enable non-DM I2C support */
 
 /*