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 <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
0329c3773e
commit
01971f65ff
|
@ -17,6 +17,7 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/i2c/twl4030.h>
|
#include <linux/i2c/twl4030.h>
|
||||||
|
#include <linux/regulator/machine.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/control.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);
|
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
|
#endif
|
||||||
|
|
|
@ -13,6 +13,7 @@ struct twl4030_hsmmc_info {
|
||||||
bool ext_clock; /* use external pin for input clock */
|
bool ext_clock; /* use external pin for input clock */
|
||||||
int gpio_cd; /* or -EINVAL */
|
int gpio_cd; /* or -EINVAL */
|
||||||
int gpio_wp; /* or -EINVAL */
|
int gpio_wp; /* or -EINVAL */
|
||||||
|
struct device *dev; /* returned: pointer to mmc adapter */
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_TWL4030_CORE) && \
|
#if defined(CONFIG_TWL4030_CORE) && \
|
||||||
|
|
|
@ -228,6 +228,9 @@ int __init omap_mmc_add(const char *name, int id, unsigned long base,
|
||||||
ret = platform_device_add(pdev);
|
ret = platform_device_add(pdev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
/* return device handle to board setup code */
|
||||||
|
data->dev = &pdev->dev;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#define OMAP_MMC_MAX_SLOTS 2
|
#define OMAP_MMC_MAX_SLOTS 2
|
||||||
|
|
||||||
struct omap_mmc_platform_data {
|
struct omap_mmc_platform_data {
|
||||||
|
/* back-link to device */
|
||||||
|
struct device *dev;
|
||||||
|
|
||||||
/* number of slots per controller */
|
/* number of slots per controller */
|
||||||
unsigned nr_slots:2;
|
unsigned nr_slots:2;
|
||||||
|
|
Reference in New Issue