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

drivers/mmc/Kconfig

@@ -299,7 +299,7 @@ config MMC_SDHCI_TEGRA
 
 config MMC_SUNXI
 	bool "Allwinner sunxi SD/MMC Host Controller support"
-	depends on ARCH_SUNXI
+	depends on ARCH_SUNXI && !UART0_PORT_F
 	default y
 	help
 	  This selects support for the SD/MMC Host Controller on

drivers/mmc/pic32_sdhci.c

@@ -15,7 +15,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int pci32_sdhci_get_cd(struct sdhci_host *host)
+static int pic32_sdhci_get_cd(struct sdhci_host *host)
 {
 	/* PIC32 SDHCI CD errata:
 	 * - set CD_TEST and clear CD_TEST_INS bit
@@ -26,7 +26,7 @@ static int pci32_sdhci_get_cd(struct sdhci_host *host)
 }
 
 static const struct sdhci_ops pic32_sdhci_ops = {
-	.get_cd	= pci32_sdhci_get_cd,
+	.get_cd	= pic32_sdhci_get_cd,
 };
 
 static int pic32_sdhci_probe(struct udevice *dev)

drivers/mmc/sdhci.c

@@ -359,7 +359,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
 		div >>= 1;
 	}
 
-	if (host->ops->set_clock)
+	if (host->ops && host->ops->set_clock)
 		host->ops->set_clock(host, div);
 
 	clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT;
@@ -427,7 +427,7 @@ static int sdhci_set_ios(struct mmc *mmc)
 	u32 ctrl;
 	struct sdhci_host *host = mmc->priv;
 
-	if (host->ops->set_control_reg)
+	if (host->ops && host->ops->set_control_reg)
 		host->ops->set_control_reg(host);
 
 	if (mmc->clock != host->clock)
@@ -480,7 +480,7 @@ static int sdhci_init(struct mmc *mmc)
 
 	sdhci_set_power(host, fls(mmc->cfg->voltages) - 1);
 
-	if (host->ops->get_cd)
+	if (host->ops && host->ops->get_cd)
 		host->ops->get_cd(host);
 
 	/* Enable only interrupts served by the SD controller */