On Thu, 18 Mar 2021, Hans de Goede wrote: > Hi Lee, > > On 3/7/21 4:17 PM, Hans de Goede wrote: > > Hi All, > > > > Here is v4 of my series to rework the arizona codec jack-detect support > > to use the snd_soc_jack helpers instead of direct extcon reporting. > > > > As discussed before here is a resend rebased on 5.12-rc2, making sure that > > all patches this depends on are in place. > > > > Lee, can you pick-up patches 1-6 through the MFD tree and then send a > > pull-req to Mark so that Mark can merge the Asoc parts throught the ASoC > > tree ? > > > > Patches 2-6 touch drivers/extcon, these all have an Ack from Chanwoo Choi > > for merging these through the MFD tree. > > Lee, is there a specific reason why these have not been merged yet, > or did you just not get around to these yet ? > > As I already mentioned Chanwoo Choi already gave an ack for merging > the extcon patches through MFD, so AFAICT eveything is ready to merge > 1-6 through the MFD tree, and then have Mark merge an ib from the > MFD tree and merge the rest. I can't remember where we left it. I guess I can take 1-6 (as suggested above) without issue. Hold tight. > > Here is some more generic info on this series from the previous > > cover-letter: > > > > This is done by reworking the extcon driver into an arizona-jackdet > > library and then modifying the codec drivers to use that directly, > > replacing the old separate extcon child-devices and extcon-driver. > > > > This brings the arizona-codec jack-detect handling inline with how > > all other ASoC codec driver do this. This was developed and tested on > > a Lenovo Yoga Tablet 1051L with a WM5102 codec. > > > > This was also tested by Charles Keepax, one of the Cirrus Codec folks. > > > > Regards, > > > > Hans > > > > > > Hans de Goede (13): > > mfd: arizona: Drop arizona-extcon cells > > extcon: arizona: Fix some issues when HPDET IRQ fires after the jack > > has been unplugged > > extcon: arizona: Fix various races on driver unbind > > extcon: arizona: Fix flags parameter to the gpiod_get("wlf,micd-pol") > > call > > extcon: arizona: Always use pm_runtime_get_sync() when we need the > > device to be awake > > ASoC/extcon: arizona: Move arizona jack code to > > sound/soc/codecs/arizona-jack.c > > ASoC: arizona-jack: Move jack-detect variables to struct arizona_priv > > ASoC: arizona-jack: Use arizona->dev for runtime-pm > > ASoC: arizona-jack: convert into a helper library for codec drivers > > ASoC: arizona-jack: Use snd_soc_jack to report jack events > > ASoC: arizona-jack: Cleanup logging > > ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use > > the new jack library > > ASoC: Intel: bytcr_wm5102: Add jack detect support > > > > MAINTAINERS | 3 +- > > drivers/extcon/Kconfig | 8 - > > drivers/extcon/Makefile | 1 - > > drivers/mfd/arizona-core.c | 20 - > > sound/soc/codecs/Makefile | 2 +- > > .../soc/codecs/arizona-jack.c | 577 +++++++----------- > > sound/soc/codecs/arizona.h | 44 ++ > > sound/soc/codecs/wm5102.c | 12 +- > > sound/soc/codecs/wm5110.c | 12 +- > > sound/soc/codecs/wm8997.c | 14 +- > > sound/soc/codecs/wm8998.c | 9 + > > sound/soc/intel/boards/bytcr_wm5102.c | 28 +- > > 12 files changed, 325 insertions(+), 405 deletions(-) > > rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (76%) > > > -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog