| Message ID | 20210307151807.35201-1-hdegoede@redhat.com |
|---|---|
| Headers | show |
| Series | MFD/extcon/ASoC: Rework arizona codec jack-detect support | expand |
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. Regards, Hans > > 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%) >
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%) > > >
Enjoy!
The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-extcon-v5.13
for you to fetch changes up to a908a716696eee75bf85199cde2b0989290536d1:
ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c (2021-03-18 11:46:15 +0000)
----------------------------------------------------------------
Immutable branch between MFD and Extcon due for the v5.13 merge window
----------------------------------------------------------------
Hans de Goede (6):
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
MAINTAINERS | 3 +-
drivers/extcon/Kconfig | 8 ---
drivers/extcon/Makefile | 1 -
drivers/mfd/arizona-core.c | 20 -------
.../soc/codecs/arizona-jack.c | 63 +++++++++++-----------
5 files changed, 34 insertions(+), 61 deletions(-)
rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (98%)
Hi, On 3/22/21 3:40 PM, Lee Jones wrote: > Enjoy! > > The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15: > > Linux 5.12-rc2 (2021-03-05 17:33:41 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-extcon-v5.13 > > for you to fetch changes up to a908a716696eee75bf85199cde2b0989290536d1: > > ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c (2021-03-18 11:46:15 +0000) Thank you. Mark can you merge this into your ASoC tree and merge patches 7-13 of: https://lore.kernel.org/alsa-devel/20210307151807.35201-1-hdegoede@redhat.com/ ? Regards, Hans > > ---------------------------------------------------------------- > Immutable branch between MFD and Extcon due for the v5.13 merge window > > ---------------------------------------------------------------- > Hans de Goede (6): > 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 > > MAINTAINERS | 3 +- > drivers/extcon/Kconfig | 8 --- > drivers/extcon/Makefile | 1 - > drivers/mfd/arizona-core.c | 20 ------- > .../soc/codecs/arizona-jack.c | 63 +++++++++++----------- > 5 files changed, 34 insertions(+), 61 deletions(-) > rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (98%) >
On Sun, 7 Mar 2021 16:17:54 +0100, Hans de Goede wrote: > 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 ? > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [07/13] ASoC: arizona-jack: Move jack-detect variables to struct arizona_priv commit: bcda8cc4b868782c1a39d722d24f7d2598978389 [08/13] ASoC: arizona-jack: Use arizona->dev for runtime-pm commit: 688c8461a425623ca6f679e6ba8965719a98def5 [09/13] ASoC: arizona-jack: convert into a helper library for codec drivers commit: ffcc84b9e814c8654e15e08816d0078d521a2724 [10/13] ASoC: arizona-jack: Use snd_soc_jack to report jack events commit: 236b7285e95af5cb5a8b63283e573f433fb9b305 [11/13] ASoC: arizona-jack: Cleanup logging commit: 69c58eb61e9b649096a0ab8cbc3c6f8521efd303 [12/13] ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack library commit: 37dbabf14ff65510fa5aeecc1707ca390e608e00 [13/13] ASoC: Intel: bytcr_wm5102: Add jack detect support commit: ecd77d494ec995fb07102b408954c94f38374084 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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. 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%)