From: Hans de Goede <hdegoede@redhat.com> To: Lee Jones <lee.jones@linaro.org>, MyungJoo Ham <myungjoo.ham@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Liam Girdwood <liam.r.girdwood@linux.intel.com>, Jie Yang <yang.jie@linux.intel.com>, Mark Brown <broonie@kernel.org> Cc: Hans de Goede <hdegoede@redhat.com>, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Andy Shevchenko <andy.shevchenko@gmail.com>, Charles Keepax <ckeepax@opensource.cirrus.com>, alsa-devel@alsa-project.org Subject: [PATCH v4 resend 06/13] ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c Date: Thu, 4 Feb 2021 12:24:55 +0100 [thread overview] Message-ID: <20210204112502.88362-7-hdegoede@redhat.com> (raw) In-Reply-To: <20210204112502.88362-1-hdegoede@redhat.com> 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. Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v4: - Add sound/soc/codecs/arizona-jack.c to the WOLFSON MICROELECTRONICS DRIVERS MAINTAINERS section 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 | 3 +-- drivers/extcon/Kconfig | 8 -------- drivers/extcon/Makefile | 1 - .../extcon-arizona.c => sound/soc/codecs/arizona-jack.c | 0 4 files changed, 1 insertion(+), 11 deletions(-) rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1c2416aa254e..5cd8cc63e6b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19258,7 +19258,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 @@ -19282,7 +19281,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 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 -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com> To: Lee Jones <lee.jones@linaro.org>, MyungJoo Ham <myungjoo.ham@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Liam Girdwood <liam.r.girdwood@linux.intel.com>, Jie Yang <yang.jie@linux.intel.com>, Mark Brown <broonie@kernel.org> Cc: alsa-devel@alsa-project.org, Charles Keepax <ckeepax@opensource.cirrus.com>, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>, Andy Shevchenko <andy.shevchenko@gmail.com> Subject: [PATCH v4 resend 06/13] ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c Date: Thu, 4 Feb 2021 12:24:55 +0100 [thread overview] Message-ID: <20210204112502.88362-7-hdegoede@redhat.com> (raw) In-Reply-To: <20210204112502.88362-1-hdegoede@redhat.com> 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. Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v4: - Add sound/soc/codecs/arizona-jack.c to the WOLFSON MICROELECTRONICS DRIVERS MAINTAINERS section 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 | 3 +-- drivers/extcon/Kconfig | 8 -------- drivers/extcon/Makefile | 1 - .../extcon-arizona.c => sound/soc/codecs/arizona-jack.c | 0 4 files changed, 1 insertion(+), 11 deletions(-) rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1c2416aa254e..5cd8cc63e6b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19258,7 +19258,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 @@ -19282,7 +19281,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 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 -- 2.29.2
next prev parent reply other threads:[~2021-02-04 11:29 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20210204112515epcas1p27a866811ba15a8cd8b0be9a3f7bf86e5@epcas1p2.samsung.com> 2021-02-04 11:24 ` [PATCH v4 resend 00/13] MFD/extcon/ASoC: Rework arizona codec jack-detect support Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 01/13] mfd: arizona: Drop arizona-extcon cells Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 13:44 ` Lee Jones 2021-02-04 13:44 ` Lee Jones 2021-02-04 11:24 ` [PATCH v4 resend 02/13] extcon: arizona: Fix some issues when HPDET IRQ fires after the jack has been unplugged Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 03/13] extcon: arizona: Fix various races on driver unbind Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 04/13] extcon: arizona: Fix flags parameter to the gpiod_get("wlf,micd-pol") call Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 04/13] extcon: arizona: Fix flags parameter to the gpiod_get("wlf, micd-pol") call Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 05/13] extcon: arizona: Always use pm_runtime_get_sync() when we need the device to be awake Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` Hans de Goede [this message] 2021-02-04 11:24 ` [PATCH v4 resend 06/13] ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 07/13] ASoC: arizona-jack: Move jack-detect variables to struct arizona_priv Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 08/13] ASoC: arizona-jack: Use arizona->dev for runtime-pm Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 09/13] ASoC: arizona-jack: convert into a helper library for codec drivers Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:24 ` [PATCH v4 resend 10/13] ASoC: arizona-jack: Use snd_soc_jack to report jack events Hans de Goede 2021-02-04 11:24 ` Hans de Goede 2021-02-04 11:25 ` [PATCH v4 resend 11/13] ASoC: arizona-jack: Cleanup logging Hans de Goede 2021-02-04 11:25 ` Hans de Goede 2021-02-04 11:25 ` [PATCH v4 resend 12/13] ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack library Hans de Goede 2021-02-04 11:25 ` Hans de Goede 2021-02-04 11:25 ` [PATCH v4 resend 13/13] ASoC: Intel: bytcr_wm5102: Add jack detect support Hans de Goede 2021-02-04 11:25 ` Hans de Goede 2021-02-05 2:00 ` [PATCH v4 resend 00/13] MFD/extcon/ASoC: Rework arizona codec jack-detect support Chanwoo Choi 2021-02-05 2:00 ` Chanwoo Choi 2021-02-05 10:27 ` Hans de Goede 2021-02-05 10:27 ` Hans de Goede 2021-02-08 19:12 ` Hans de Goede 2021-02-08 19:12 ` Hans de Goede 2021-02-09 14:14 ` Lee Jones 2021-02-09 14:14 ` Lee Jones 2021-02-09 14:52 ` Hans de Goede 2021-02-09 14:52 ` Hans de Goede 2021-02-09 15:45 ` Lee Jones 2021-02-09 15:45 ` Lee Jones 2021-02-09 16:34 ` Hans de Goede 2021-02-09 16:34 ` Hans de Goede 2021-02-09 16:44 ` Lee Jones 2021-02-09 16:44 ` Lee Jones 2021-02-10 19:57 ` Mark Brown 2021-02-10 19:57 ` Mark Brown 2021-02-11 8:40 ` Lee Jones 2021-02-11 8:40 ` Lee Jones 2021-03-07 15:17 Hans de Goede 2021-03-07 15:18 ` [PATCH v4 resend 06/13] ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c Hans de Goede 2021-03-07 15:18 ` Hans de Goede
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210204112502.88362-7-hdegoede@redhat.com \ --to=hdegoede@redhat.com \ --cc=alsa-devel@alsa-project.org \ --cc=andy.shevchenko@gmail.com \ --cc=broonie@kernel.org \ --cc=cezary.rojewski@intel.com \ --cc=ckeepax@opensource.cirrus.com \ --cc=cw00.choi@samsung.com \ --cc=lee.jones@linaro.org \ --cc=liam.r.girdwood@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=myungjoo.ham@samsung.com \ --cc=patches@opensource.cirrus.com \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=yang.jie@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.