omap3: Introduce weak misc_init_r

Introduce a __weak misc_init_r function that just runs dieid_num_r().
Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was
all they did for misc_init_r.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Peter Barada <peter.barada@logicpd.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1fee57436493e89a3bfc3ec8f980b64a0eb0c5cf..f2e52e9ce1b7c639269bf1cbce5cc2060596860f 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -41,6 +41,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/omap_common.h>
 #include <i2c.h>
+#include <linux/compiler.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
@@ -244,6 +245,17 @@ void s_init(void)
                mem_init();
 }
 
+/*
+ * Routine: misc_init_r
+ * Description: A basic misc_init_r that just displays the die ID
+ */
+int __weak misc_init_r(void)
+{
+       dieid_num_r();
+
+       return 0;
+}
+
 /******************************************************************************
  * Routine: wait_for_command_complete
  * Description: Wait for posting to finish on watchdog

diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index d81b555fb9334016e3b407a8ec073ef9e58253fb..4c77790e4f249329be461365f65c24f35d635ab4 100644 (file)
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -99,17 +99,6 @@ int board_init(void)
        return 0;
 }
 
-/*
- * Routine: misc_init_r
- * Description: display die ID
- */
-int misc_init_r(void)
-{
-       dieid_num_r();
-
-       return 0;
-}
-
 /*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the

diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c
index 8f0b52702b02c92cef6493b5e12cea08910db138..8f75af19d4c4624ad967c0aa08b28239b0e5c1a9 100644 (file)
--- a/board/htkw/mcx/mcx.c
+++ b/board/htkw/mcx/mcx.c
@@ -68,17 +68,6 @@ int board_init(void)
        return 0;
 }
 
-/*
- * Routine: misc_init_r
- * Description: late init.
- */
-int misc_init_r(void)
-{
-       dieid_num_r();
-
-       return 0;
-}
-
 /*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 89b114bf6d713ae60e35fc893e8cd8eb4f1f7f4d..12bcfcb877382e206a3411fedbb7ee720af9c11d 100644 (file)
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -144,17 +144,6 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-/*
- * Routine: misc_init_r
- * Description: display die ID register
- */
-int misc_init_r(void)
-{
-       dieid_num_r();
-
-       return 0;
-}
-
 #ifdef CONFIG_SMC911X
 /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
 static const u32 gpmc_lan92xx_config[] = {

diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c
index c7aedc95a625dc7ecf782312255ff57d57a4e872..9fbaedd79205de2b823019cbbe1655ed92e3530d 100644 (file)
--- a/board/teejet/mt_ventoux/mt_ventoux.c
+++ b/board/teejet/mt_ventoux/mt_ventoux.c
@@ -196,13 +196,6 @@ int board_init(void)
        return 0;
 }
 
-int misc_init_r(void)
-{
-       dieid_num_r();
-
-       return 0;
-}
-
 /*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the