common: Drop asm/global_data.h from common header

[u-boot.git] / arch / arm / mach-omap2 / omap3 / emif4.c

diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index a2aadc9816975e7ec00da1a8874ce4ebf414a188..df6e9ce1d6ce2c8d0478db2a0b5170324d9c5b23 100644 (file)
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Author :
  *     Vaibhav Hiremath <[email protected]>
@@ -6,11 +7,11 @@
  *
  * Copyright (C) 2010
  * Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
@@ -76,7 +77,7 @@ static void do_emif4_init(void)
        regval |= (1<<10);
        writel(regval, &emif4_base->sdram_iodft_tlgc);
        /*Wait till that bit clears*/
-       while ((readl(&emif4_base->sdram_iodft_tlgc) & (1<<10)) == 0x1);
+       while ((readl(&emif4_base->sdram_iodft_tlgc) & (1<<10)) != 0x0);
        /*Re-verify the DDR PHY status*/
        while ((readl(&emif4_base->sdram_sts) & (1<<2)) == 0x0);
 
@@ -142,7 +143,7 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize (void)
+int dram_init_banksize(void)
 {
        unsigned int size0 = 0, size1 = 0;
 
@@ -153,6 +154,8 @@ void dram_init_banksize (void)
        gd->bd->bi_dram[0].size = size0;
        gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + get_sdr_cs_offset(CS1);
        gd->bd->bi_dram[1].size = size1;
+
+       return 0;
 }
 
 /*