Set time and umask on multi-dtb fit images to ensure reproducibile builds.

[oweals/u-boot.git] / drivers / mmc / hi6220_dw_mmc.c

diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 731458c18c5630a382e533ae38f169ea713c5211..ce395d53c9421a592102c375ae09cc5b99629ca5 100644 (file)
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -1,14 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Linaro
  * peter.griffin <peter.griffin@linaro.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dwmmc.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
+#include <linux/errno.h>
 
 #define        DWMMC_MAX_CH_NUM                4
 
@@ -20,7 +19,7 @@
 
 static int hi6220_dwmci_core_init(struct dwmci_host *host, int index)
 {
-       host->name = "HiKey DWMMC";
+       host->name = "Hisilicon DWMMC";
 
        host->dev_index = index;
 
@@ -44,11 +43,11 @@ int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width)
 
        host = calloc(1, sizeof(struct dwmci_host));
        if (!host) {
-               error("dwmci_host calloc failed!\n");
+               pr_err("dwmci_host calloc failed!\n");
                return -ENOMEM;
        }
 
-       host->ioaddr = (void *)regbase;
+       host->ioaddr = (void *)(ulong)regbase;
        host->buswidth = bus_width;
        host->bus_hz = MMC0_DEFAULT_FREQ;