ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init()

[platform/kernel/u-boot.git] / board / davinci / schmoogie / dv_board.c

diff --git a/board/davinci/schmoogie/dv_board.c b/board/davinci/schmoogie/dv_board.c
index 9f271a1..529a437 100644 (file)
--- a/board/davinci/schmoogie/dv_board.c
+++ b/board/davinci/schmoogie/dv_board.c
@@ -29,9 +29,8 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/emac_defs.h>
 
-#define MACH_TYPE_SCHMOOGIE            1255
+DECLARE_GLOBAL_DATA_PTR;
 
-extern void    i2c_init(int speed, int slaveaddr);
 extern void    timer_init(void);
 extern int     eth_hw_init(void);
 extern phy_t   phy;
@@ -71,7 +70,7 @@ void lpsc_on(unsigned int id)
                (id == DAVINCI_LPSC_McBSP) ||
                (id == DAVINCI_LPSC_GPIO)
           )
-               *mdctl |= 0x200;
+               *mdctl |= 0x200;
 
        REG(PSC_PTCMD) = 0x01;
 
@@ -115,8 +114,6 @@ void dsp_on(void)
 
 int board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* arch number of the board */
        gd->bd->bi_arch_number = MACH_TYPE_SCHMOOGIE;
 
@@ -244,8 +241,6 @@ int misc_init_r (void)
 
 int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;