From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <samuel.ortiz@intel.com>,
Dmitry Torokhov <dtor@mail.ru>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Misael Lopez Cruz <misael.lopez@ti.com>
Subject: [PATCH 04/17] MFD: twl6040: Fix power on GPIO handling
Date: Thu, 15 Sep 2011 15:39:26 +0300 [thread overview]
Message-ID: <1316090379-30760-5-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1316090379-30760-1-git-send-email-peter.ujfalusi@ti.com>
Avoid requesting the audpwron gpio in case of ES1.0
revision.
In the past we requested the gpio, but we did not
free it up, since we made the check for the revision
later. This results later checks for gpio validity to
fail, leaving the gpio reserved (even after the driver
has been removed).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/mfd/twl6040-core.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 51c3b47..7dc8c47 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -470,7 +470,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, twl6040);
twl6040->dev = &pdev->dev;
- twl6040->audpwron = pdata->audpwron_gpio;
twl6040->irq = pdata->naudint_irq;
twl6040->irq_base = pdata->irq_base;
@@ -480,6 +479,12 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);
+ /* ERRATA: Automatic power-up is not possible in ES1.0 */
+ if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0)
+ twl6040->audpwron = pdata->audpwron_gpio;
+ else
+ twl6040->audpwron = -EINVAL;
+
if (gpio_is_valid(twl6040->audpwron)) {
ret = gpio_request(twl6040->audpwron, "audpwron");
if (ret)
@@ -490,10 +495,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
goto gpio2_err;
}
- /* ERRATA: Automatic power-up is not possible in ES1.0 */
- if (twl6040_get_revid(twl6040) == TWL6040_REV_ES1_0)
- twl6040->audpwron = -EINVAL;
-
/* codec interrupt */
ret = twl6040_irq_init(twl6040);
if (ret)
--
1.7.6.1
next prev parent reply other threads:[~2011-09-15 12:40 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 12:39 [PATCH 00/17] ASoC: twl6040: Cleanups and fixes Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 01/17] MFD: twl6040: Remove global pointer for platform_device Peter Ujfalusi
2011-09-18 16:37 ` Samuel Ortiz
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 02/17] MFD: twl6040: Add accessor for revision ID Peter Ujfalusi
2011-09-18 16:37 ` Samuel Ortiz
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 03/17] Input: twl6040-vibra: Use accessor to get revision information Peter Ujfalusi
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` Peter Ujfalusi [this message]
2011-09-18 16:39 ` [PATCH 04/17] MFD: twl6040: Fix power on GPIO handling Samuel Ortiz
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 05/17] ASoC: twl6040: Chip initialization cleanup Peter Ujfalusi
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 06/17] ASoC: twl6040: Use chip defaults in the initial reg_cache Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 07/17] ASoC: twl6040: Lower the initial gains Peter Ujfalusi
2011-09-19 11:00 ` Mark Brown
2011-09-19 11:26 ` Péter Ujfalusi
2011-09-19 11:40 ` Mark Brown
2011-09-21 9:22 ` Péter Ujfalusi
2011-09-21 12:39 ` Mark Brown
2011-09-21 13:03 ` Péter Ujfalusi
2011-09-21 13:14 ` Péter Ujfalusi
2011-09-21 13:17 ` Mark Brown
2011-09-21 13:25 ` Péter Ujfalusi
2011-09-21 13:33 ` Mark Brown
2011-09-15 12:39 ` [PATCH 08/17] ASoC: twl6040: Fix comments for register names Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 09/17] ASoC: twl6040: Remove strings "NULL" from DAPM route Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 10/17] ASoC: twl6040: Introduce SW only shadow register Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 11/17] ASoC: twl6040: Earphone path correction Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 12/17] ASoC: twl6040: Use consistent names for Handsfree path Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 13/17] ASoC: twl6040: Use consistent names for Headset path Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 14/17] ASoC: twl6040: Support for AUX L/R output Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 15/17] ASoC: twl6040/sdp4430: Change legacy DAI name Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 16/17] ASoC/MFD: twl6040: Combine bit definitions for Headset control registers Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 17/17] ASoC: twl6040: Workaround for headset DC offset caused pop noise Peter Ujfalusi
2011-09-16 9:19 ` [PATCH 00/17] ASoC: twl6040: Cleanups and fixes Liam Girdwood
2011-09-18 16:41 ` Samuel Ortiz
2011-09-19 10:12 ` [alsa-devel] " Mark Brown
2011-09-19 11:32 ` Péter Ujfalusi
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=1316090379-30760-5-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dtor@mail.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=misael.lopez@ti.com \
--cc=samuel.ortiz@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: 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®