[U-Boot] [RFC v0 03/11] omap3: Move V_OSCK / V_SCLK to omap3_common.h

Tom Rini
2012-03-22T19:09:09Z

We provide the common values for these clocks here and allow boards to
provide their own values if needed.

Signed-off-by: Tom Rini <trini@ti.com>
---
include/configs/am3517_crane.h | 4 ----
include/configs/am3517_evm.h | 4 ----
include/configs/cm_t35.h | 4 ----
include/configs/devkit8000.h | 4 ----
include/configs/dig297.h | 5 -----
include/configs/igep00x0.h | 4 ----
include/configs/mcx.h | 4 ----
include/configs/omap3_beagle.h | 4 ----
include/configs/omap3_common.h | 8 ++++++++
include/configs/omap3_evm_common.h | 6 ------
include/configs/omap3_logic.h | 4 ----
include/configs/omap3_mvblx.h | 4 ----
include/configs/omap3_overo.h | 4 ----
include/configs/omap3_pandora.h | 4 ----
include/configs/omap3_sdp3430.h | 4 ----
include/configs/omap3_zoom1.h | 4 ----
include/configs/omap3_zoom2.h | 4 ----
include/configs/tam3517-common.h | 4 ----
include/configs/tricorder.h | 4 ----
19 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 8a1bb0a..7dc2eee 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -42,10 +42,6 @@
*/
#define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 2a442c7..3a6daa4 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -42,10 +42,6 @@
*/
#define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 1061564..6724527 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -51,10 +51,6 @@

#define CONFIG_SYS_TEXT_BASE 0x80008000

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 98eeb5e..e6c9859 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -56,10 +56,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80100000

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 3820ecb..e0a518c 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -58,11 +58,6 @@

#define CONFIG_SYS_TEXT_BASE 0x80008000

-
-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index 8e8082d..c4feba2 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -39,10 +39,6 @@
* Other configuration options
*/

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#define CONFIG_MISC_INIT_R

#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0f3e427..02793e5 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -51,10 +51,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80008000

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#define CONFIG_MISC_INIT_R

#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index aab371e..a372646 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -45,10 +45,6 @@
*/
#define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h
index cc8e146..f54aff1 100644
--- a/include/configs/omap3_common.h
+++ b/include/configs/omap3_common.h
@@ -41,4 +41,12 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO

+/* Clock Defines */
+#ifndef V_OSCK
+#define V_OSCK 26000000 /* Clock output from T2 */
+#endif
+#ifndef V_SCLK
+#define V_SCLK (V_OSCK >> 1)
+#endif
+
#endif /* __CONFIG_OMAP3_COMMON_H */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 742faa1..0b4dcf1 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -38,12 +38,6 @@
#undef CONFIG_USE_IRQ /* no support for IRQs */

/*
- * Clock related definitions
- */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
-/*
* OMAP3 has 12 GP timers, they can be driven by the system clock
* (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
* This rate is divided by a local divisor.
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index d0b1af8..6d245db 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -48,10 +48,6 @@

#define CONFIG_SYS_TEXT_BASE 0x80400000

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */

#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index 5c6a50f..8465577 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -49,10 +49,6 @@
#define CONFIG_MVBLX /* working with mvBlueLYNX-X */
#define CONFIG_MACH_TYPE MACH_TYPE_MVBLX

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index c927bad..661fb22 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -36,10 +36,6 @@
*/
#define CONFIG_OMAP3_OVERO /* working with overo */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index de20959..c5dc8b5 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -40,10 +40,6 @@
*/
#define CONFIG_OMAP3_PANDORA /* working with pandora */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index af76f8b..faf8a6f 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -56,10 +56,6 @@
*/
#define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 2ad20f3..9367849 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -46,10 +46,6 @@
*/
#define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 87878d8..6d46ab7 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -47,10 +47,6 @@
*/
#define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 1de40c0..057f173 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -42,10 +42,6 @@

#define CONFIG_SYS_CACHELINE_SIZE 64

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 24f019c..79de4f3 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -57,10 +57,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80100000

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
#undef CONFIG_USE_IRQ /* no support for IRQs */
#define CONFIG_MISC_INIT_R

--
1.7.0.4