summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/mcp-core.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-20 22:13:52 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-18 23:15:30 +0000
commitabe06082d07fcb0673cb93338c1d6f037fdc375b (patch)
tree1ea446f1a77a30f3cb06e19f1af6f2a4ddfb6b6b /drivers/mfd/mcp-core.c
parenta6aecae29affdd1a84198afe45ef9e13ecbf9826 (diff)
downloadlinux-abe06082d07fcb0673cb93338c1d6f037fdc375b.tar.gz
linux-abe06082d07fcb0673cb93338c1d6f037fdc375b.tar.bz2
linux-abe06082d07fcb0673cb93338c1d6f037fdc375b.zip
MFD: mcp/ucb1x00: separate ucb1x00 driver data from the MCP data
Patch taken from 5dd7bf59e0 (ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.) by Jochen Friedrich <jochen@scram.de>. This adds just the codec data part of the patch. Acked-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mfd/mcp-core.c')
-rw-r--r--drivers/mfd/mcp-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index 280a4f8a7876..c409d6327140 100644
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -217,8 +217,9 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size)
}
EXPORT_SYMBOL(mcp_host_alloc);
-int mcp_host_add(struct mcp *mcp)
+int mcp_host_add(struct mcp *mcp, void *pdata)
{
+ mcp->attached_device.platform_data = pdata;
dev_set_name(&mcp->attached_device, "mcp0");
return device_add(&mcp->attached_device);
}