summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-08-04 18:58:18 +0200
committerSamuel Ortiz <sameo@openedhand.com>2008-08-10 20:10:10 +0200
commitd2432a6321b8f578018690d0c5384ee5de19737d (patch)
treee71aae947959154a001e52d27d6f10dc5cac3e3f /drivers
parent56bf2bda0651ca368a259468e4f309c71ed35c35 (diff)
downloadlinux-stable-d2432a6321b8f578018690d0c5384ee5de19737d.tar.gz
linux-stable-d2432a6321b8f578018690d0c5384ee5de19737d.tar.bz2
linux-stable-d2432a6321b8f578018690d0c5384ee5de19737d.zip
mfd: tc6387 MMC platform data
We need to pass the cell as the platform data. Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/tc6387xb.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 9fd6f80b50f6..a22b21ac6cf8 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -17,6 +17,10 @@
#include <linux/mfd/tmio.h>
#include <linux/mfd/tc6387xb.h>
+enum {
+ TC6387XB_CELL_MMC,
+};
+
#ifdef CONFIG_PM
static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
{
@@ -87,7 +91,7 @@ static struct resource tc6387xb_mmc_resources[] = {
};
static struct mfd_cell tc6387xb_cells[] = {
- {
+ [TC6387XB_CELL_MMC] = {
.name = "tmio-mmc",
.enable = tc6387xb_mmc_enable,
.disable = tc6387xb_mmc_disable,
@@ -119,6 +123,11 @@ static int tc6387xb_probe(struct platform_device *dev)
printk(KERN_INFO "Toshiba tc6387xb initialised\n");
+ tc6387xb_cells[TC6387XB_CELL_MMC].platform_data =
+ &tc6387xb_cells[TC6387XB_CELL_MMC];
+ tc6387xb_cells[TC6387XB_CELL_MMC].data_size =
+ sizeof(tc6387xb_cells[TC6387XB_CELL_MMC]);
+
ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
ARRAY_SIZE(tc6387xb_cells), iomem, irq);