| Message ID | 20210122164107.361939-7-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | MFD/extcon/ASoC: Rework arizona codec jack-detect support | expand |
On Fri, Jan 22, 2021 at 6:41 PM Hans de Goede <hdegoede@redhat.com> wrote: > > The jack handling for arizona codecs is being refactored so that it is > done directly by the codec drivers, instead of having an extcon-driver > bind to a separate "arizona-extcon" child-device for this. > > drivers/mfd/arizona-core.c has already been updated to no longer > instantiate an "arizona-extcon" child-device for the arizona codecs. > > This means that the "arizona-extcon" driver is no longer useful > (there are no longer any devices for it to bind to). > > This commit drops the extcon Kconfig / Makefile bits and moves > drivers/extcon/extcon-arizona.c to sound/soc/codecs/arizona-jack.c . > > This is a preparation patch for converting the arizona extcon-driver into > a helper library for letting the arizona codec-drivers directly report jack > state through the standard sound/soc/soc-jack.c functions. ... > MAINTAINERS | 1 - > -F: drivers/extcon/extcon-arizona.c Commit message doesn't shed a light if we need to move this actually to another record in MAINTAINERS database.
Hi, On 1/22/21 9:40 PM, Andy Shevchenko wrote: > On Fri, Jan 22, 2021 at 6:41 PM Hans de Goede <hdegoede@redhat.com> wrote: >> >> The jack handling for arizona codecs is being refactored so that it is >> done directly by the codec drivers, instead of having an extcon-driver >> bind to a separate "arizona-extcon" child-device for this. >> >> drivers/mfd/arizona-core.c has already been updated to no longer >> instantiate an "arizona-extcon" child-device for the arizona codecs. >> >> This means that the "arizona-extcon" driver is no longer useful >> (there are no longer any devices for it to bind to). >> >> This commit drops the extcon Kconfig / Makefile bits and moves >> drivers/extcon/extcon-arizona.c to sound/soc/codecs/arizona-jack.c . >> >> This is a preparation patch for converting the arizona extcon-driver into >> a helper library for letting the arizona codec-drivers directly report jack >> state through the standard sound/soc/soc-jack.c functions. > > ... > >> MAINTAINERS | 1 - > >> -F: drivers/extcon/extcon-arizona.c > > Commit message doesn't shed a light if we need to move this actually > to another record in MAINTAINERS database. Ah, good call, yes we should. I'll fix this for v4. Regards, Hans
diff --git a/MAINTAINERS b/MAINTAINERS index 036a03c794de..270661fcdb78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19249,7 +19249,6 @@ F: Documentation/devicetree/bindings/sound/wlf,arizona.yaml F: Documentation/hwmon/wm83??.rst F: arch/arm/mach-s3c/mach-crag6410* F: drivers/clk/clk-wm83*.c -F: drivers/extcon/extcon-arizona.c F: drivers/gpio/gpio-*wm*.c F: drivers/gpio/gpio-arizona.c F: drivers/hwmon/wm83??-hwmon.c diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig index af58ebca2bf6..e3db936becfd 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig @@ -21,14 +21,6 @@ config EXTCON_ADC_JACK help Say Y here to enable extcon device driver based on ADC values. -config EXTCON_ARIZONA - tristate "Wolfson Arizona EXTCON support" - depends on MFD_ARIZONA && INPUT && SND_SOC - help - Say Y here to enable support for external accessory detection - with Wolfson Arizona devices. These are audio CODECs with - advanced audio accessory detection support. - config EXTCON_AXP288 tristate "X-Power AXP288 EXTCON support" depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile index fe10a1b7d18b..1b390d934ca9 100644 --- a/drivers/extcon/Makefile +++ b/drivers/extcon/Makefile @@ -6,7 +6,6 @@ obj-$(CONFIG_EXTCON) += extcon-core.o extcon-core-objs += extcon.o devres.o obj-$(CONFIG_EXTCON_ADC_JACK) += extcon-adc-jack.o -obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o obj-$(CONFIG_EXTCON_FSA9480) += extcon-fsa9480.o obj-$(CONFIG_EXTCON_GPIO) += extcon-gpio.o diff --git a/drivers/extcon/extcon-arizona.c b/sound/soc/codecs/arizona-jack.c similarity index 100% rename from drivers/extcon/extcon-arizona.c rename to sound/soc/codecs/arizona-jack.c
The jack handling for arizona codecs is being refactored so that it is done directly by the codec drivers, instead of having an extcon-driver bind to a separate "arizona-extcon" child-device for this. drivers/mfd/arizona-core.c has already been updated to no longer instantiate an "arizona-extcon" child-device for the arizona codecs. This means that the "arizona-extcon" driver is no longer useful (there are no longer any devices for it to bind to). This commit drops the extcon Kconfig / Makefile bits and moves drivers/extcon/extcon-arizona.c to sound/soc/codecs/arizona-jack.c . This is a preparation patch for converting the arizona extcon-driver into a helper library for letting the arizona codec-drivers directly report jack state through the standard sound/soc/soc-jack.c functions. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v3: - Fold the 2 separate patches to add a copy of extcon-arizona.c as sound/soc/codecs/arizona-jack.c and the follow up patch to remove the extcon driver into 1 patch simply moving the extcon driver code. --- MAINTAINERS | 1 - drivers/extcon/Kconfig | 8 -------- drivers/extcon/Makefile | 1 - .../extcon-arizona.c => sound/soc/codecs/arizona-jack.c | 0 4 files changed, 10 deletions(-) rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (100%)