diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-10 12:08:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-10 12:08:12 +0000 |
| commit | 0969afcc449d5d655784c04e938cf4cfc6e89c0e (patch) | |
| tree | a763ddfc2969cb820da13dcec6065801bfe79f65 /include | |
| parent | ASoC: omap-mcbsp - add support for upto 16 channels. (diff) | |
| parent | MFD: twl4030-codec: APLL_INFREQ handling in the MFD driver (diff) | |
| download | linux-dev-0969afcc449d5d655784c04e938cf4cfc6e89c0e.tar.xz linux-dev-0969afcc449d5d655784c04e938cf4cfc6e89c0e.zip | |
Merge branch 'twl4030-mfd' into for-2.6.33
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c/twl4030.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/twl4030-codec.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index ba61add3e05a..5306a759cbde 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h @@ -414,6 +414,7 @@ struct twl4030_codec_vibra_data { }; struct twl4030_codec_data { + unsigned int audio_mclk; struct twl4030_codec_audio_data *audio; struct twl4030_codec_vibra_data *vibra; }; diff --git a/include/linux/mfd/twl4030-codec.h b/include/linux/mfd/twl4030-codec.h index ef0a3041d759..2ec317c68e59 100644 --- a/include/linux/mfd/twl4030-codec.h +++ b/include/linux/mfd/twl4030-codec.h @@ -267,5 +267,6 @@ enum twl4030_codec_res { int twl4030_codec_disable_resource(enum twl4030_codec_res id); int twl4030_codec_enable_resource(enum twl4030_codec_res id); +unsigned int twl4030_codec_get_mclk(void); #endif /* End of __TWL4030_CODEC_H__ */ |