[06/12] ARM: OMAP3: mmc-twl4030 init passes device nodes back

Commit Message

Tony Lindgren March 16, 2009, 5:44 p.m. UTC

* Russell King - ARM Linux <[e-mail]> [090315 09:02]:
> On Tue, Mar 10, 2009 at 02:08:43PM -0700, Tony Lindgren wrote:
> > From: David Brownell <[e-mail]>
> > 
> > When setting up HSMMC devices, pass pass the device nodes back so
> 
> Double pass?

Here's this one updated to fix the typo.

Tony

Comments

Russell King - ARM Linux March 16, 2009, 10:22 p.m. UTC | #1

On Mon, Mar 16, 2009 at 10:44:15AM -0700, Tony Lindgren wrote:
> * Russell King - ARM Linux <[e-mail]> [090315 09:02]:
> > On Tue, Mar 10, 2009 at 02:08:43PM -0700, Tony Lindgren wrote:
> > > From: David Brownell <[e-mail]>
> > > 
> > > When setting up HSMMC devices, pass pass the device nodes back so
> > 
> > Double pass?
> 
> Here's this one updated to fix the typo.

Ok.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

From 587cf51b738e653751516809c161d5e325342023 Mon Sep 17 00:00:00 2001
From: David Brownell <[e-mail]>
Date: Mon, 16 Mar 2009 10:40:39 -0700
Subject: [PATCH] ARM: OMAP3: mmc-twl4030 init passes device nodes back, v2

When setting up HSMMC devices, pass the device nodes back so
board code can linking them to their power supply regulators.

Signed-off-by: David Brownell <[e-mail]>
Signed-off-by: Tony Lindgren <[e-mail]>

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index df1539e..c67078d 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -17,6 +17,7 @@ 
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/i2c/twl4030.h>
+#include <linux/regulator/machine.h>
 
 #include <mach/hardware.h>
 #include <mach/control.h>
@@ -437,6 +438,15 @@  void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 	}
 
 	omap2_init_mmc(hsmmc_data, OMAP34XX_NR_MMC);
+
+	/* pass the device nodes back to board setup code */
+	for (c = controllers; c->mmc; c++) {
+		struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc - 1];
+
+		if (!c->mmc || c->mmc > nr_hsmmc)
+			continue;
+		c->dev = mmc->dev;
+	}
 }
 
 #endif
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h
index 380dde7..21d3572 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/mmc-twl4030.h
@@ -13,6 +13,7 @@  struct twl4030_hsmmc_info {
 	bool	ext_clock;	/* use external pin for input clock */
 	int	gpio_cd;	/* or -EINVAL */
 	int	gpio_wp;	/* or -EINVAL */
+	struct device *dev;	/* returned: pointer to mmc adapter */
 };
 
 #if	defined(CONFIG_TWL4030_CORE) && \
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 208dbb1..87fb7ff 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -228,6 +228,9 @@  int __init omap_mmc_add(const char *name, int id, unsigned long base,
 	ret = platform_device_add(pdev);
 	if (ret)
 		goto fail;
+
+	/* return device handle to board setup code */
+	data->dev = &pdev->dev;
 	return 0;
 
 fail:
diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h
index 73a9e15..4435bd4 100644
--- a/arch/arm/plat-omap/include/mach/mmc.h
+++ b/arch/arm/plat-omap/include/mach/mmc.h
@@ -37,6 +37,8 @@ 
 #define OMAP_MMC_MAX_SLOTS	2
 
 struct omap_mmc_platform_data {
+	/* back-link to device */
+	struct device *dev;
 
 	/* number of slots per controller */
 	unsigned nr_slots:2;