Hello Liam, Mark! The following two patch is for the current multi-comp branch with twl4030 related fixes. I have separated them, so they can be squased to the corresponding commit in multi-comp branch for now. The changes in short: - We do not need the header sound/soc/codecs/twl4030.h anymore, so remove it - Fix machine drivers with theis header removal - The codec no longer get's the former setup data, all configuration is coming from board files via the platform_data. So change the code accordingly - Move the twl4030_priv allocation to a proper place - Codec can shall go OFF instead of STANDBY, so add back the idle_bias_off flag - The MFD driver is twl4030-audio TODO after the multi-comp is merged: - Rename the mfd driver to twl4030-audio. Clean up the internal naming within the mfd This going to touch many files... One more notice: The multi-comp branch does not have the "ASoC: TWL4030: Capture route runtime DAPM ordering fix" commit yet, and I have tested my changes on top of that, but it should not be a big problem, when you rebase this driver. What do you think? Peter --- Peter Ujfalusi (2): ASoC: multi-comp: twl4030: TI CODECs ASoC: multi-comp: twl4030: TI OMAP Platform drivers/mfd/twl-core.c | 2 +- drivers/mfd/twl4030-codec.c | 4 +- include/linux/i2c/twl.h | 6 +++- sound/soc/codecs/twl4030.c | 73 ++++++++++++++++++++--------------------- sound/soc/codecs/twl4030.h | 52 ----------------------------- sound/soc/omap/igep0020.c | 1 - sound/soc/omap/omap2evm.c | 1 - sound/soc/omap/omap3beagle.c | 1 - sound/soc/omap/omap3evm.c | 1 - sound/soc/omap/omap3pandora.c | 1 - sound/soc/omap/overo.c | 1 - sound/soc/omap/sdp3430.c | 4 ++- sound/soc/omap/zoom2.c | 4 ++- 13 files changed, 50 insertions(+), 101 deletions(-) delete mode 100644 sound/soc/codecs/twl4030.h -- 1.7.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
