Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / mach-mvebu / arm64-common.c

diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 7055a81de32279cb7a18b8ec541e6e6629e11ae1..1c0477a3cacd273d4b8e10f1f768a9aa17082c90 100644 (file)
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -16,6 +16,23 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/*
+ * Not all memory is mapped in the MMU. So we need to restrict the
+ * memory size so that U-Boot does not try to access it. Also, the
+ * internal registers are located at 0xf000.0000 - 0xffff.ffff.
+ * Currently only 2GiB are mapped for system memory. This is what
+ * we pass to the U-Boot subsystem here.
+ */
+#define USABLE_RAM_SIZE                0x80000000
+
+ulong board_get_usable_ram_top(ulong total_size)
+{
+       if (gd->ram_size > USABLE_RAM_SIZE)
+               return USABLE_RAM_SIZE;
+
+       return gd->ram_size;
+}
+
 /*
  * On ARMv8, MBus is not configured in U-Boot. To enable compilation
  * of the already implemented drivers, lets add a dummy version of
@@ -65,7 +82,7 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        const void *fdt = gd->fdt_blob;
        const fdt32_t *val;
@@ -73,13 +90,13 @@ void dram_init_banksize(void)
 
        val = get_memory_reg_prop(fdt, &len);
        if (len < 0)
-               return;
+               return -ENXIO;
 
        ac = fdt_address_cells(fdt, 0);
        sc = fdt_size_cells(fdt, 0);
        if (ac < 1 || sc > 2 || sc < 1 || sc > 2) {
                printf("invalid address/size cells\n");
-               return;
+               return -ENXIO;
        }
 
        cells = ac + sc;
@@ -97,6 +114,8 @@ void dram_init_banksize(void)
                      i, (unsigned long)gd->bd->bi_dram[i].start,
                      (unsigned long)gd->bd->bi_dram[i].size);
        }
+
+       return 0;
 }
 
 int arch_cpu_init(void)
@@ -109,12 +128,20 @@ int arch_early_init_r(void)
 {
        struct udevice *dev;
        int ret;
-
-       /* Call the comphy code via the MISC uclass driver */
-       ret = uclass_get_device(UCLASS_MISC, 0, &dev);
-       if (ret) {
-               debug("COMPHY init failed: %d\n", ret);
-               return -ENODEV;
+       int i;
+
+       /*
+        * Loop over all MISC uclass drivers to call the comphy code
+        * and init all CP110 devices enabled in the DT
+        */
+       i = 0;
+       while (1) {
+               /* Call the comphy code via the MISC uclass driver */
+               ret = uclass_get_device(UCLASS_MISC, i++, &dev);
+
+               /* We're done, once no further CP110 device is found */
+               if (ret)
+                       break;
        }
 
        /* Cause the SATA device to do its early init */