Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 17:16:14 +0000 (17:16 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 17:16:14 +0000 (17:16 +0000)
commit49bc389ec2318b75e86a3c3239a495d7a8311046
tree5fe953bd06a535b262ac3da29ab9aa09e5a57d8c
parentaed9913e6fad5a7eccce2b7a3ee6daa96b575157
parentdf8c3dbee9e6f19ddb0ae8e05cdf76eb2d3b7f00
Merge tag 'arizona-extcon-asoc' of git://git./linux/kernel/git/broonie/misc into asoc-arizona

ASoC/extcon: arizona: Fix interaction between HPDET and headphone outputs

This patch series covers both ASoC and extcon subsystems and fixes an
interaction between the HPDET function and the headphone outputs - we
really shouldn't run HPDET while the headphone is active.  The first
patch is a refactoring to make the extcon side easier.
sound/soc/codecs/arizona.c
sound/soc/codecs/arizona.h
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c