aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-08-04 12:58:18 -0400
committerSamuel Ortiz <sameo@openedhand.com>2008-08-10 14:10:10 -0400
commitd2432a6321b8f578018690d0c5384ee5de19737d (patch)
treee71aae947959154a001e52d27d6f10dc5cac3e3f
parent56bf2bda0651ca368a259468e4f309c71ed35c35 (diff)
mfd: tc6387 MMC platform data
We need to pass the cell as the platform data. Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
-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 @@
17#include <linux/mfd/tmio.h> 17#include <linux/mfd/tmio.h>
18#include <linux/mfd/tc6387xb.h> 18#include <linux/mfd/tc6387xb.h>
19 19
20enum {
21 TC6387XB_CELL_MMC,
22};
23
20#ifdef CONFIG_PM 24#ifdef CONFIG_PM
21static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state) 25static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
22{ 26{
@@ -87,7 +91,7 @@ static struct resource tc6387xb_mmc_resources[] = {
87}; 91};
88 92
89static struct mfd_cell tc6387xb_cells[] = { 93static struct mfd_cell tc6387xb_cells[] = {
90 { 94 [TC6387XB_CELL_MMC] = {
91 .name = "tmio-mmc", 95 .name = "tmio-mmc",
92 .enable = tc6387xb_mmc_enable, 96 .enable = tc6387xb_mmc_enable,
93 .disable = tc6387xb_mmc_disable, 97 .disable = tc6387xb_mmc_disable,
@@ -119,6 +123,11 @@ static int tc6387xb_probe(struct platform_device *dev)
119 123
120 printk(KERN_INFO "Toshiba tc6387xb initialised\n"); 124 printk(KERN_INFO "Toshiba tc6387xb initialised\n");
121 125
126 tc6387xb_cells[TC6387XB_CELL_MMC].platform_data =
127 &tc6387xb_cells[TC6387XB_CELL_MMC];
128 tc6387xb_cells[TC6387XB_CELL_MMC].data_size =
129 sizeof(tc6387xb_cells[TC6387XB_CELL_MMC]);
130
122 ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells, 131 ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
123 ARRAY_SIZE(tc6387xb_cells), iomem, irq); 132 ARRAY_SIZE(tc6387xb_cells), iomem, irq);
124 133