From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dtor@mail.ru>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>
Cc: Tero Kristo <t-kristo@ti.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org,
Benoit Cousson <b-cousson@ti.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 10/14] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO
Date: Mon, 10 Sep 2012 13:46:28 +0300 [thread overview]
Message-ID: <1347273992-9107-11-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1347273992-9107-1-git-send-email-peter.ujfalusi@ti.com>
Remove the use of set_hs_extmute callback and let the codec driver to
handle the extmute GPIO.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-zoom-peripherals.c | 9 ++-------
arch/arm/mach-omap2/include/mach/board-zoom.h | 2 --
sound/soc/omap/zoom2.c | 4 ----
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index b797cb2..a7d3b04 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -34,6 +34,7 @@
#include "common-board-devices.h"
#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
+#define ZOOM2_HEADSET_EXTMUTE_GPIO (153)
#define OMAP_ZOOM_WLAN_IRQ_GPIO (162)
#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES)
@@ -244,12 +245,6 @@ static int zoom_twl_gpio_setup(struct device *dev,
return ret;
}
-/* EXTMUTE callback function */
-static void zoom2_set_hs_extmute(int mute)
-{
- gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
static struct twl4030_gpio_platform_data zoom_gpio_data = {
.gpio_base = OMAP_MAX_GPIO_LINES,
.irq_base = TWL4030_GPIO_IRQ_BASE,
@@ -279,7 +274,7 @@ static int __init omap_i2c_init(void)
codec_data->ramp_delay_value = 3; /* 161 ms */
codec_data->hs_extmute = 1;
- codec_data->set_hs_extmute = zoom2_set_hs_extmute;
+ codec_data->hs_extmute_gpio = ZOOM2_HEADSET_EXTMUTE_GPIO;
}
omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
omap_register_i2c_bus(2, 400, NULL, 0);
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h
index 775fdc3..2e94869 100644
--- a/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@ -8,5 +8,3 @@
extern int __init zoom_debugboard_init(void);
extern void __init zoom_peripherals_init(void);
extern void __init zoom_display_init(void);
-
-#define ZOOM2_HEADSET_EXTMUTE_GPIO 153
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 920e0d9..df97a41 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -191,9 +191,6 @@ static int __init zoom2_soc_init(void)
BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0);
gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0);
- BUG_ON(gpio_request(ZOOM2_HEADSET_EXTMUTE_GPIO, "ext_mute") < 0);
- gpio_direction_output(ZOOM2_HEADSET_EXTMUTE_GPIO, 0);
-
return 0;
err1:
@@ -207,7 +204,6 @@ module_init(zoom2_soc_init);
static void __exit zoom2_soc_exit(void)
{
gpio_free(ZOOM2_HEADSET_MUX_GPIO);
- gpio_free(ZOOM2_HEADSET_EXTMUTE_GPIO);
platform_device_unregister(zoom2_snd_device);
}
--
1.7.12
next prev parent reply other threads:[~2012-09-10 10:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 10:46 [PATCH v4 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 01/14] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 03/14] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 04/14] MFD: twl-core: Add API to query the HFCLK rate Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 05/14] MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 06/14] dt: Add empty of_find_node_by_name() function Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 07/14] MFD: twl4030-audio: Add DT support Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 08/14] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 09/14] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi
2012-09-10 10:46 ` Peter Ujfalusi [this message]
2012-09-10 10:46 ` [PATCH v4 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 12/14] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 13/14] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 14/14] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi
2012-09-19 0:24 ` [PATCH v4 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Samuel Ortiz
2012-09-19 8:34 ` Peter Ujfalusi
2012-09-22 15:19 ` Mark Brown
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=1347273992-9107-11-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dtor@mail.ru \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=rob.herring@calxeda.com \
--cc=sameo@linux.intel.com \
--cc=t-kristo@ti.com \
--cc=tony@atomide.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®