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

2016-10-07 22:02:10 -04:00
parent 1f95770807 3dddc793e0
commit f5fd45ff64
70 changed files with 7233 additions and 389 deletions
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1010,6 +1010,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
 	}

 	upriv->mmc = priv->mmc;
+	priv->mmc->dev = dev;

 	return 0;
 }