From patchwork Wed Aug 8 09:41:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293901 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id ED0D93FC23 for ; Wed, 8 Aug 2012 09:43:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964935Ab2HHJmG (ORCPT ); Wed, 8 Aug 2012 05:42:06 -0400 Received: from na3sys009aog124.obsmtp.com ([74.125.149.151]:57514 "EHLO na3sys009aog124.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030280Ab2HHJmA (ORCPT ); Wed, 8 Aug 2012 05:42:00 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]) (using TLSv1) by na3sys009aob124.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0Z1U6K5CUsohOU2yYZcwIDwHY7xk5@postini.com; Wed, 08 Aug 2012 02:42:00 PDT Received: by obbup19 with SMTP id up19so935167obb.40 for ; Wed, 08 Aug 2012 02:41:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=hLp6842xehS+aq/vItTLcSG6QKuHVwN4Zwi1uXtWOS4=; b=oSlHpe/QnsaMYS7fVOWra2lBaZlkusPFnt0cWkWbjZBMf8kFxNhDmkzARo3OCFX5wu Zm6JGCZ50oq5gTZ1sGlyo37mtq/UgMQdKJms/HpwoFl2gStwJFtQxrJ5ixcmkkQzOAor 3wCDu8zONxmzt5iB4FHD6Y006EEpm4nj4p55NI4k0yGnQcinQaPBZJFkG0INFm2N5E+y kSVONrIBtAtPhCTc4kQexXmmR3f75E9SdVZLAA7fUKPVpZO1vILcNYhwDOEznwBDut58 e8pQ5HwKAClZOC8kOeUeGJ3g0nsMAnzPmgwAn5EliteoJFHnRTm8dlsoWvxwnMRednr1 c3WQ== Received: by 10.182.78.228 with SMTP id e4mr28813228obx.77.1344418918862; Wed, 08 Aug 2012 02:41:58 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id c6sm22141308obn.13.2012.08.08.02.41.55 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:41:58 -0700 (PDT) From: Peter Ujfalusi To: Samuel Ortiz , Mark Brown , Liam Girdwood , Tony Lindgren , Dmitry Torokhov Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson Subject: [PATCH 06/11] ASoC: twl4030: Move hs_extmute GPIO handling to driver Date: Wed, 8 Aug 2012 12:41:22 +0300 Message-Id: <1344418887-5262-7-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> References: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQmpx15F7VE4yU82Aw90wz7gyxvyoI2JiYIIQR0w0NlNmsW3oPMj4OvZXhanV8zlHt3by7qW Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The external mute (if it is in use) is handled by a GPIO line. Prepare to remove the set_hs_extmute callback and replace it with two sets of platform data: hs_extmute_gpio: the GPIO number to use for external mute hs_extmute_disable_level: the GPIO level to use when the external mute is not enabled. The codec driver can handle the external mute functionality based on these parameters and when the users of set_hs_extmute has been converted the callback can be removed. Signed-off-by: Peter Ujfalusi --- include/linux/i2c/twl.h | 6 +++++- sound/soc/codecs/twl4030.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 7ea898c..75ce6d1 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -666,7 +666,11 @@ struct twl4030_codec_data { unsigned int check_defaults:1; unsigned int reset_registers:1; unsigned int hs_extmute:1; - void (*set_hs_extmute)(int mute); + void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and + hs_extmute_disable_level */ + int hs_extmute_gpio; + unsigned int hs_extmute_disable_level:1; /* the GPIO state to disable + the extmute */ }; struct twl4030_vibra_data { diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 391fcfc..0630040 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -302,6 +303,24 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) u8 reg, byte; int i = 0; + if (pdata && pdata->hs_extmute && + gpio_is_valid(pdata->hs_extmute_gpio)) { + int ret, level; + + if (!pdata->hs_extmute_gpio) + dev_warn(codec->dev, + "Extmute GPIO is 0 is this correct?\n"); + + level = pdata->hs_extmute_disable_level; + ret = gpio_request_one(pdata->hs_extmute_gpio, level ? + GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW, + "hs_extmute"); + if (ret) { + dev_err(codec->dev, "Failed to get hs_extmute GPIO\n"); + pdata->hs_extmute_gpio = -1; + } + } + /* Check defaults, if instructed before anything else */ if (pdata && pdata->check_defaults) twl4030_check_defaults(codec); @@ -748,7 +767,11 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) /* Enable external mute control, this dramatically reduces * the pop-noise */ if (pdata && pdata->hs_extmute) { - if (pdata->set_hs_extmute) { + if (gpio_is_valid(pdata->hs_extmute_gpio)) { + gpio_set_value(pdata->hs_extmute_gpio, + !pdata->hs_extmute_disable_level); + } else if (pdata->set_hs_extmute) { + dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); pdata->set_hs_extmute(1); } else { hs_pop |= TWL4030_EXTMUTE; @@ -786,7 +809,11 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) /* Disable external mute */ if (pdata && pdata->hs_extmute) { - if (pdata->set_hs_extmute) { + if (gpio_is_valid(pdata->hs_extmute_gpio)) { + gpio_set_value(pdata->hs_extmute_gpio, + pdata->hs_extmute_disable_level); + } else if (pdata->set_hs_extmute) { + dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); pdata->set_hs_extmute(0); } else { hs_pop &= ~TWL4030_EXTMUTE; @@ -2230,12 +2257,17 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) static int twl4030_soc_remove(struct snd_soc_codec *codec) { + struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); /* Reset registers to their chip default before leaving */ twl4030_reset_registers(codec); twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); kfree(twl4030); + + if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio)) + gpio_free(pdata->hs_extmute_gpio); + return 0; }