ASoC/extcon: arizona: Move arizona jack code 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>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index d92f85c..dd40d5e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19378,7 +19378,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
@@ -19402,7 +19401,7 @@ F:      include/linux/mfd/wm8400*
 F:     include/linux/regulator/arizona*
 F:     include/linux/wm97xx.h
 F:     include/sound/wm????.h
-F:     sound/soc/codecs/arizona.?
+F:     sound/soc/codecs/arizona*
 F:     sound/soc/codecs/cs47l24*
 F:     sound/soc/codecs/wm*
 

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index af58ebc..e3db936 100644 (file)
--- 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 fe10a1b..1b390d9 100644 (file)
--- 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