diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-20 22:13:52 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-18 23:15:30 (GMT) |
| commit | abe06082d07fcb0673cb93338c1d6f037fdc375b (patch) | |
| tree | 1ea446f1a77a30f3cb06e19f1af6f2a4ddfb6b6b /include | |
| parent | a6aecae29affdd1a84198afe45ef9e13ecbf9826 (diff) | |
| download | linux-fsl-qoriq-abe06082d07fcb0673cb93338c1d6f037fdc375b.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/mfd/mcp.h | 3 | ||||
| -rw-r--r-- | include/linux/mfd/ucb1x00.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h index dfe7e51..bfcdf6d 100644 --- a/include/linux/mfd/mcp.h +++ b/include/linux/mfd/mcp.h @@ -20,7 +20,6 @@ struct mcp { unsigned int sclk_rate; unsigned int rw_timeout; struct device attached_device; - int gpio_base; }; struct mcp_ops { @@ -41,7 +40,7 @@ void mcp_disable(struct mcp *); #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) struct mcp *mcp_host_alloc(struct device *, size_t); -int mcp_host_add(struct mcp *); +int mcp_host_add(struct mcp *, void *); void mcp_host_del(struct mcp *); void mcp_host_free(struct mcp *); diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h index 4321f04..731b23a 100644 --- a/include/linux/mfd/ucb1x00.h +++ b/include/linux/mfd/ucb1x00.h @@ -104,6 +104,9 @@ #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) #define UCB_MODE_AUD_OFF_CAN (1 << 13) +struct ucb1x00_plat_data { + int gpio_base; +}; struct ucb1x00_irq { void *devid; |