xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MFD: mcp/ucb1x00: separate ucb1x00 driver data from the MCP data

Browse Source 
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>
This commit is contained in:
Russell King
2012-01-20 22:13:52 +00:00
parent a6aecae29a
commit abe06082d0
8 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mfd/mcp-sa11x0.c
View File

@@ -194,7 +194,6 @@ static int mcp_sa11x0_probe(struct platform_device *dev)
mcp->owner = THIS_MODULE;
mcp->ops = &mcp_sa11x0;
mcp->sclk_rate = data->sclk_rate;
mcp->gpio_base = data->gpio_base;
m = priv(mcp);
m->mccr0 = data->mccr0 | 0x7f7f;
@@ -229,7 +228,7 @@ static int mcp_sa11x0_probe(struct platform_device *dev)
mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) /
mcp->sclk_rate;
ret = mcp_host_add(mcp);
ret = mcp_host_add(mcp, data->codec_pdata);
if (ret == 0)
return 0;