dm: mmc: Set up the device pointer when using the MMC uclass

Update the existing drivers to set up this new pointer. This will be required by the MMC uclass. Signed-off-by: Simon Glass <sjg@chromium.org>

dm: mmc: Set up the device pointer when using the MMC uclass
Update the existing drivers to set up this new pointer. This will be required by the MMC uclass. Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass · Eric Lee · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent b6694a33c4
Showing 7 changed files with 14 additions and 1 deletions Side-by-side Diff
drivers/mmc/omap_hsmmc.c
drivers/mmc/pic32_sdhci.c
drivers/mmc/rockchip_dw_mmc.c
drivers/mmc/socfpga_dw_mmc.c
drivers/mmc/uniphier-sd.c
drivers/mmc/zynq_sdhci.c
include/mmc.h
@@ -825,6 +825,7 @@
 	gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN);
 #endif
  
+	mmc->dev = dev;
 	upriv->mmc = mmc;
  
 	return 0;
@@ -41,7 +41,12 @@
 		return ret;
 	}
  
-	return add_sdhci(host, f_min_max[1], f_min_max[0]);
+	ret = add_sdhci(host, f_min_max[1], f_min_max[0]);
+	if (ret)
+		return ret;
+	host->mmc->dev = dev;
+
+	return 0;
 }
  
 static const struct udevice_id pic32_sdhci_ids[] = {
@@ -104,6 +104,7 @@
 	if (ret)
 		return ret;
  
+	host->mmc->dev = dev;
 	upriv->mmc = host->mmc;
  
 	return 0;
@@ -108,6 +108,7 @@
 		return ret;
  
 	upriv->mmc = host->mmc;
+	host->mmc->dev = dev;
  
 	return 0;
 }
@@ -725,6 +725,7 @@
 		return -EIO;
  
 	upriv->mmc = priv->mmc;
+	priv->mmc->dev = dev;
  
 	return 0;
 }
@@ -35,6 +35,7 @@
 		  CONFIG_ZYNQ_SDHCI_MIN_FREQ);
  
 	upriv->mmc = host->mmc;
+	host->mmc->dev = dev;
  
 	return 0;
 }
@@ -381,6 +381,9 @@
 	char init_in_progress;	/* 1 if we have done mmc_start_init() */
 	char preinit;		/* start init as early as possible */
 	int ddr_mode;
+#ifdef CONFIG_DM_MMC
+	struct udevice *dev;	/* Device for this MMC controller */
+#endif
 };
  
 struct mmc_hwpart_conf {
...	...	@@ -825,6 +825,7 @@
825	825	gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN);
826	826	#endif
827	827
	828	+ mmc->dev = dev;
828	829	upriv->mmc = mmc;
829	830
830	831	return 0;
...	...	@@ -41,7 +41,12 @@
41	41	return ret;
42	42	}
43	43
44		- return add_sdhci(host, f_min_max[1], f_min_max[0]);
	44	+ ret = add_sdhci(host, f_min_max[1], f_min_max[0]);
	45	+ if (ret)
	46	+ return ret;
	47	+ host->mmc->dev = dev;
	48	+
	49	+ return 0;
45	50	}
46	51
47	52	static const struct udevice_id pic32_sdhci_ids[] = {
...	...	@@ -104,6 +104,7 @@
104	104	if (ret)
105	105	return ret;
106	106
	107	+ host->mmc->dev = dev;
107	108	upriv->mmc = host->mmc;
108	109
109	110	return 0;
...	...	@@ -108,6 +108,7 @@
108	108	return ret;
109	109
110	110	upriv->mmc = host->mmc;
	111	+ host->mmc->dev = dev;
111	112
112	113	return 0;
113	114	}
...	...	@@ -725,6 +725,7 @@
725	725	return -EIO;
726	726
727	727	upriv->mmc = priv->mmc;
	728	+ priv->mmc->dev = dev;
728	729
729	730	return 0;
730	731	}
...	...	@@ -35,6 +35,7 @@
35	35	CONFIG_ZYNQ_SDHCI_MIN_FREQ);
36	36
37	37	upriv->mmc = host->mmc;
	38	+ host->mmc->dev = dev;
38	39
39	40	return 0;
40	41	}
...	...	@@ -381,6 +381,9 @@
381	381	char init_in_progress; /* 1 if we have done mmc_start_init() */
382	382	char preinit; /* start init as early as possible */
383	383	int ddr_mode;
	384	+#ifdef CONFIG_DM_MMC
	385	+ struct udevice dev; / Device for this MMC controller */
	386	+#endif
384	387	};
385	388
386	389	struct mmc_hwpart_conf {