net: mt7628-eth: add support to isolate LAN/WAN ports

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

diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 7a7e67f6f3579ee4164161ee7eacf1b7b3cae6ab..cae42ec4acebb75f192f977dc314510dc86337df 100644 (file)
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Qualcomm SDHCI driver - SD/eMMC controller
  *
  * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
  *
  * Based on Linux driver
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -109,15 +108,15 @@ static int msm_sdc_probe(struct udevice *dev)
 
 
        /* Wait for reset to be written to register */
-       if (wait_for_bit(__func__, prv->base + SDCC_MCI_STATUS2,
-                        SDCC_MCI_STATUS2_MCI_ACT, false, 10, false)) {
+       if (wait_for_bit_le32(prv->base + SDCC_MCI_STATUS2,
+                             SDCC_MCI_STATUS2_MCI_ACT, false, 10, false)) {
                printf("msm_sdhci: reset request failed\n");
                return -EIO;
        }
 
        /* SW reset can take upto 10HCLK + 15MCLK cycles. (min 40us) */
-       if (wait_for_bit(__func__, prv->base + SDCC_MCI_POWER,
-                        SDCC_MCI_POWER_SW_RST, false, 2, false)) {
+       if (wait_for_bit_le32(prv->base + SDCC_MCI_POWER,
+                             SDCC_MCI_POWER_SW_RST, false, 2, false)) {
                printf("msm_sdhci: stuck in reset\n");
                return -ETIMEDOUT;
        }
@@ -142,12 +141,12 @@ static int msm_sdc_probe(struct udevice *dev)
                writel(caps, host->ioaddr + SDHCI_VENDOR_SPEC_CAPABILITIES0);
        }
 
-       ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
        host->mmc = &plat->mmc;
+       host->mmc->dev = dev;
+       ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
        if (ret)
                return ret;
        host->mmc->priv = &prv->host;
-       host->mmc->dev = dev;
        upriv->mmc = host->mmc;
 
        return sdhci_probe(dev);
@@ -171,7 +170,7 @@ static int msm_ofdata_to_platdata(struct udevice *dev)
        int node = dev_of_offset(dev);
 
        host->name = strdup(dev->name);
-       host->ioaddr = (void *)dev_get_addr(dev);
+       host->ioaddr = (void *)devfdt_get_addr(dev);
        host->bus_width = fdtdec_get_int(gd->fdt_blob, node, "bus-width", 4);
        host->index = fdtdec_get_uint(gd->fdt_blob, node, "index", 0);
        priv->base = (void *)fdtdec_get_addr_size_auto_parent(gd->fdt_blob,