From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> To: Russell King <linux@arm.linux.org.uk>, Daniel Mack <daniel@zonque.org>, Robert Jarzmik <robert.jarzmik@free.fr>, Linus Walleij <linus.walleij@linaro.org>, Alexandre Courbot <gnurou@gmail.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Samuel Ortiz <sameo@linux.intel.com>, Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>, Jingoo Han <jg1.han@samsung.com>, Liam Girdwood <lgirdwood@gmail.com>, Andrea Adami <andrea.adami@gmail.com> Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-input@vger.kernel.org, linux-spi@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v4 14/18] ASoC: pxa: poodle: make use of new locomo GPIO interface Date: Mon, 25 May 2015 14:41:49 +0300 [thread overview] Message-ID: <1432554113-26280-15-git-send-email-dbaryshkov@gmail.com> (raw) In-Reply-To: <1432554113-26280-1-git-send-email-dbaryshkov@gmail.com> Since LoCoMo driver has been converted to provide proper gpiolib interface, make poodle ASoC platform driver use gpiolib API. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Acked-by: Mark Brown <broonie@kernel.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> --- sound/soc/pxa/poodle.c | 52 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 0fce8c4..c5b7c5e 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -20,15 +20,11 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/gpio/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> -#include <asm/mach-types.h> -#include <asm/hardware/locomo.h> -#include <mach/poodle.h> -#include <mach/audio.h> - #include "../codecs/wm8731.h" #include "pxa2xx-i2s.h" @@ -42,22 +38,18 @@ static int poodle_jack_func; static int poodle_spk_func; +static struct gpio_desc *poodle_mute_l, *poodle_mute_r, *poodle_amp_on; static void poodle_ext_control(struct snd_soc_dapm_context *dapm) { /* set up jack connection */ if (poodle_jack_func == POODLE_HP) { - /* set = unmute headphone */ - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 1); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 1); + gpiod_set_value(poodle_mute_l, 0); + gpiod_set_value(poodle_mute_r, 0); snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); } else { - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 0); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 0); + gpiod_set_value(poodle_mute_l, 1); + gpiod_set_value(poodle_mute_r, 1); snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); } @@ -84,11 +76,8 @@ static int poodle_startup(struct snd_pcm_substream *substream) /* we need to unmute the HP at shutdown as the mute burns power on poodle */ static void poodle_shutdown(struct snd_pcm_substream *substream) { - /* set = unmute headphone */ - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 1); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 1); + gpiod_set_value(poodle_mute_l, 0); + gpiod_set_value(poodle_mute_r, 0); } static int poodle_hw_params(struct snd_pcm_substream *substream, @@ -178,12 +167,7 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol, static int poodle_amp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - if (SND_SOC_DAPM_EVENT_ON(event)) - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 0); - else - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 1); + gpiod_set_value(poodle_amp_on, (SND_SOC_DAPM_EVENT_ON(event))); return 0; } @@ -268,13 +252,17 @@ static int poodle_probe(struct platform_device *pdev) struct snd_soc_card *card = &poodle; int ret; - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 0); - /* should we mute HP at startup - burning power ?*/ - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 0); - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 0); + poodle_mute_l = devm_gpiod_get(&pdev->dev, "mute-l", GPIOD_OUT_HIGH); + if (IS_ERR(poodle_mute_l)) + return PTR_ERR(poodle_mute_l); + + poodle_mute_r = devm_gpiod_get(&pdev->dev, "mute-r", GPIOD_OUT_HIGH); + if (IS_ERR(poodle_mute_r)) + return PTR_ERR(poodle_mute_l); + + poodle_amp_on = devm_gpiod_get(&pdev->dev, "amp-on", GPIOD_OUT_LOW); + if (IS_ERR(poodle_amp_on)) + return PTR_ERR(poodle_amp_on); card->dev = &pdev->dev; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: dbaryshkov@gmail.com (Dmitry Eremin-Solenikov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 14/18] ASoC: pxa: poodle: make use of new locomo GPIO interface Date: Mon, 25 May 2015 14:41:49 +0300 [thread overview] Message-ID: <1432554113-26280-15-git-send-email-dbaryshkov@gmail.com> (raw) In-Reply-To: <1432554113-26280-1-git-send-email-dbaryshkov@gmail.com> Since LoCoMo driver has been converted to provide proper gpiolib interface, make poodle ASoC platform driver use gpiolib API. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Acked-by: Mark Brown <broonie@kernel.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> --- sound/soc/pxa/poodle.c | 52 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 0fce8c4..c5b7c5e 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -20,15 +20,11 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/gpio/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> -#include <asm/mach-types.h> -#include <asm/hardware/locomo.h> -#include <mach/poodle.h> -#include <mach/audio.h> - #include "../codecs/wm8731.h" #include "pxa2xx-i2s.h" @@ -42,22 +38,18 @@ static int poodle_jack_func; static int poodle_spk_func; +static struct gpio_desc *poodle_mute_l, *poodle_mute_r, *poodle_amp_on; static void poodle_ext_control(struct snd_soc_dapm_context *dapm) { /* set up jack connection */ if (poodle_jack_func == POODLE_HP) { - /* set = unmute headphone */ - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 1); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 1); + gpiod_set_value(poodle_mute_l, 0); + gpiod_set_value(poodle_mute_r, 0); snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); } else { - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 0); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 0); + gpiod_set_value(poodle_mute_l, 1); + gpiod_set_value(poodle_mute_r, 1); snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); } @@ -84,11 +76,8 @@ static int poodle_startup(struct snd_pcm_substream *substream) /* we need to unmute the HP at shutdown as the mute burns power on poodle */ static void poodle_shutdown(struct snd_pcm_substream *substream) { - /* set = unmute headphone */ - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 1); - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 1); + gpiod_set_value(poodle_mute_l, 0); + gpiod_set_value(poodle_mute_r, 0); } static int poodle_hw_params(struct snd_pcm_substream *substream, @@ -178,12 +167,7 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol, static int poodle_amp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - if (SND_SOC_DAPM_EVENT_ON(event)) - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 0); - else - locomo_gpio_write(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 1); + gpiod_set_value(poodle_amp_on, (SND_SOC_DAPM_EVENT_ON(event))); return 0; } @@ -268,13 +252,17 @@ static int poodle_probe(struct platform_device *pdev) struct snd_soc_card *card = &poodle; int ret; - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_AMP_ON, 0); - /* should we mute HP at startup - burning power ?*/ - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_L, 0); - locomo_gpio_set_dir(&poodle_locomo_device.dev, - POODLE_LOCOMO_GPIO_MUTE_R, 0); + poodle_mute_l = devm_gpiod_get(&pdev->dev, "mute-l", GPIOD_OUT_HIGH); + if (IS_ERR(poodle_mute_l)) + return PTR_ERR(poodle_mute_l); + + poodle_mute_r = devm_gpiod_get(&pdev->dev, "mute-r", GPIOD_OUT_HIGH); + if (IS_ERR(poodle_mute_r)) + return PTR_ERR(poodle_mute_l); + + poodle_amp_on = devm_gpiod_get(&pdev->dev, "amp-on", GPIOD_OUT_LOW); + if (IS_ERR(poodle_amp_on)) + return PTR_ERR(poodle_amp_on); card->dev = &pdev->dev; -- 2.1.4
next prev parent reply other threads:[~2015-05-25 11:41 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-25 11:41 [PATCH v4 00/18] new MFD LoCoMo driver set Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 01/18] mfd: add new driver for Sharp LoCoMo Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-27 10:27 ` Lee Jones 2015-05-27 10:27 ` Lee Jones 2015-05-27 14:55 ` Dmitry Eremin-Solenikov 2015-05-27 14:55 ` Dmitry Eremin-Solenikov 2015-05-28 11:58 ` Lee Jones 2015-05-28 11:58 ` Lee Jones 2015-05-28 19:07 ` Dmitry Eremin-Solenikov 2015-05-28 19:07 ` Dmitry Eremin-Solenikov 2015-06-02 11:33 ` Linus Walleij 2015-06-02 11:33 ` Linus Walleij 2015-05-25 11:41 ` [PATCH v4 02/18] leds: port locomo leds driver to new locomo core Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 03/18] input: convert LoCoMo keyboard driver to use " Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov [not found] ` <1432554113-26280-4-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2015-05-26 17:44 ` Dmitry Torokhov 2015-05-26 17:44 ` Dmitry Torokhov 2015-05-25 11:41 ` [PATCH v4 05/18] input: make LoCoMo keyboard driver support both poodle and collie Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 12/18] ARM: sa1100: make collie use new locomo drivers Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov [not found] ` <1432554113-26280-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2015-05-25 11:41 ` [PATCH v4 04/18] input: locomokbd: differentiate between two Enter keys Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov [not found] ` <1432554113-26280-5-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2015-05-26 17:45 ` Dmitry Torokhov 2015-05-26 17:45 ` Dmitry Torokhov 2015-05-25 11:41 ` [PATCH v4 06/18] video: backlight: add new locomo backlight driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 07/18] video: lcd: add LoCoMo LCD driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 08/18] gpio: port LoCoMo gpio support from old driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 09/18] gpio: locomo: implement per-pin irq handling Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 10/18] spi: add locomo SPI driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 11/18] i2c: add locomo i2c driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 13/18] ARM: sa1100: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 16/18] ARM: pxa: poodle: " Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov [this message] 2015-05-25 11:41 ` [PATCH v4 14/18] ASoC: pxa: poodle: make use of new locomo GPIO interface Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 15/18] ARM: pxa: poodle: use new LoCoMo driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-26 21:18 ` Robert Jarzmik 2015-05-26 21:18 ` Robert Jarzmik 2015-05-25 11:41 ` [PATCH v4 17/18] video: backlight: drop old locomo bl/lcd driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov 2015-05-25 11:41 ` [PATCH v4 18/18] ARM: drop old LoCoMo driver Dmitry Eremin-Solenikov 2015-05-25 11:41 ` Dmitry Eremin-Solenikov
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=1432554113-26280-15-git-send-email-dbaryshkov@gmail.com \ --to=dbaryshkov@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=andrea.adami@gmail.com \ --cc=broonie@kernel.org \ --cc=daniel@zonque.org \ --cc=dmitry.torokhov@gmail.com \ --cc=gnurou@gmail.com \ --cc=jg1.han@samsung.com \ --cc=lee.jones@linaro.org \ --cc=lgirdwood@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=robert.jarzmik@free.fr \ --cc=sameo@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.