alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: "Andrew F. Davis" <afd@ti.com>
To: "Liam Girdwood" <lgirdwood@gmail.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Benoît Cousson" <bcousson@baylibre.com>,
	"Tony Lindgren" <tony@atomide.com>
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, "Andrew F . Davis" <afd@ti.com>
Subject: [PATCH v2 17/19] ASoC: tlv320aic31xx: Add overflow detection support
Date: Wed, 29 Nov 2017 15:32:58 -0600	[thread overview]
Message-ID: <20171129213300.20021-18-afd@ti.com> (raw)
In-Reply-To: <20171129213300.20021-1-afd@ti.com>

Similar to short circuit detection, when the ADC/DAC is saturated and
overflows poor audio quality can result and should be reported to the
user. This device support Automatic Dynamic Range Compression (DRC)
to reduce this but it is not enabled currently in this driver.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 sound/soc/codecs/tlv320aic31xx.c | 20 +++++++++++++++++++-
 sound/soc/codecs/tlv320aic31xx.h |  7 +++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index fd3109366377..094b1596f9cc 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1277,6 +1277,23 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
 	if (value & AIC31XX_HPRSCDETECT)
 		dev_err(dev, "Short circuit on Right output is detected\n");
 
+	ret = regmap_read(aic31xx->regmap, AIC31XX_OFFLAG, &value);
+	if (ret) {
+		dev_err(dev, "Failed to read overflow flag: %d\n", ret);
+		return IRQ_NONE;
+	}
+
+	if (value & AIC31XX_DAC_OF_LEFT)
+		dev_err(dev, "Left-channel DAC overflow has occurred\n");
+	if (value & AIC31XX_DAC_OF_RIGHT)
+		dev_err(dev, "Right-channel DAC overflow has occurred\n");
+	if (value & AIC31XX_DAC_OF_SHIFTER)
+		dev_err(dev, "DAC barrel shifter overflow has occurred\n");
+	if (value & AIC31XX_ADC_OF)
+		dev_err(dev, "ADC overflow has occurred\n");
+	if (value & AIC31XX_ADC_OF_SHIFTER)
+		dev_err(dev, "ADC barrel shifter overflow has occurred\n");
+
 	return IRQ_HANDLED;
 }
 
@@ -1348,7 +1365,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
 				   AIC31XX_GPIO1_FUNC_SHIFT);
 
 		regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL,
-			     AIC31XX_SC);
+			     AIC31XX_SC |
+			     AIC31XX_ENGINE);
 
 		ret = devm_request_threaded_irq(aic31xx->dev, aic31xx->irq,
 						NULL, aic31xx_irq,
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 9dc85b6f6ad3..d062663f66b5 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -166,6 +166,13 @@ enum aic31xx_type {
 #define AIC31XX_HPRDRVPWRSTATUS_MASK	BIT(1)
 #define AIC31XX_SPRDRVPWRSTATUS_MASK	BIT(0)
 
+/* AIC31XX_OFFLAG */
+#define AIC31XX_DAC_OF_LEFT		BIT(7)
+#define AIC31XX_DAC_OF_RIGHT		BIT(6)
+#define AIC31XX_DAC_OF_SHIFTER		BIT(5)
+#define AIC31XX_ADC_OF			BIT(3)
+#define AIC31XX_ADC_OF_SHIFTER		BIT(1)
+
 /* AIC31XX_INTRDACFLAG */
 #define AIC31XX_HPLSCDETECT		BIT(7)
 #define AIC31XX_HPRSCDETECT		BIT(6)
-- 
2.15.0

  parent reply	other threads:[~2017-11-29 21:32 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-29 21:32 [PATCH v2 00/19] Add Headphone Detection to TLV320AIC31xx Driver Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 01/19] ASoC: tlv320aic31xx: File header and copyright cleanup Andrew F. Davis
2017-11-30 12:29   ` Mark Brown
2017-11-30 12:33   ` Applied "ASoC: tlv320aic31xx: File header and copyright cleanup" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 02/19] ASoC: tlv320aic31xx: Change aic31xx_power_off return type to void Andrew F. Davis
2017-11-30 12:32   ` Applied "ASoC: tlv320aic31xx: Change aic31xx_power_off return type to void" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 04/19] ASoC: tlv320aic31xx: General source formatting cleanup Andrew F. Davis
2017-12-01 13:43   ` Applied "ASoC: tlv320aic31xx: General source formatting cleanup" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 05/19] ASoC: tlv320aic31xx: Fix GPIO1 register definition Andrew F. Davis
2017-11-30 12:32   ` Applied "ASoC: tlv320aic31xx: Fix GPIO1 register definition" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 06/19] ASoC: tlv320aic31xx: Reformat header file using GENMASK and BIT macros Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 07/19] ASoC: tlv320aic31xx: Merge init function into probe Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 09/19] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis
     [not found]   ` <20171129213300.20021-10-afd-l0cyMroinI0@public.gmane.org>
2017-12-01 13:26     ` Mark Brown
2017-12-05 21:20       ` Andrew F. Davis
2017-12-06 12:45         ` Mark Brown
2017-12-06 16:19           ` Andrew F. Davis
     [not found]             ` <10f1b19b-4a0a-e336-b757-933d46b5c8e9-l0cyMroinI0@public.gmane.org>
2017-12-06 17:30               ` Mark Brown
2017-12-06 17:48                 ` Andrew F. Davis
     [not found]                   ` <b6f581be-6d3a-6fc3-036f-9efc1bfc2429-l0cyMroinI0@public.gmane.org>
2017-12-06 18:15                     ` Mark Brown
2017-12-06 18:40                       ` Andrew F. Davis
     [not found]                         ` <86e13e26-e8d5-35ed-6bd0-d91d9323d5e6-l0cyMroinI0@public.gmane.org>
2017-12-06 19:11                           ` Mark Brown
2017-12-06 19:15                             ` Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 10/19] ASoC: tlv320aic31xx: Add MICBIAS off setting Andrew F. Davis
     [not found]   ` <20171129213300.20021-11-afd-l0cyMroinI0@public.gmane.org>
2017-12-01 13:30     ` Mark Brown
2017-12-01 14:56       ` Andrew F. Davis
2017-12-01 17:43         ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 11/19] ASoC: tlv320aic31xx: Check clock and divider before division Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 12/19] ASoC: tlv320aic31xx: Add CODEC clock slave support Andrew F. Davis
2017-12-01 13:43   ` Applied "ASoC: tlv320aic31xx: Add CODEC clock slave support" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 13/19] ASoC: tlv320aic31xx: Fix inverted BCLK handling Andrew F. Davis
2017-12-01 13:42   ` Applied "ASoC: tlv320aic31xx: Handle inverted BCLK in non-DSP modes" to the asoc tree Mark Brown
2017-11-29 21:32 ` [PATCH v2 14/19] ASoC: tlv320aic31xx: Remove regulator notification handling Andrew F. Davis
2017-12-01 13:36   ` Mark Brown
2017-12-01 15:01     ` Andrew F. Davis
2017-12-01 15:55       ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 15/19] ASoC: tlv320aic31xx: Reset registers during power up Andrew F. Davis
2017-12-01 13:37   ` Mark Brown
2017-12-01 15:04     ` Andrew F. Davis
2017-12-01 15:55       ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 16/19] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
     [not found]   ` <20171129213300.20021-17-afd-l0cyMroinI0@public.gmane.org>
2017-12-01 13:39     ` Mark Brown
2017-12-01 15:32       ` Andrew F. Davis
2017-12-01 15:57         ` Mark Brown
2017-12-06 17:15           ` Andrew F. Davis
2017-12-06 20:22         ` Andrew F. Davis
2017-12-07 12:03           ` Mark Brown
2017-12-07 15:37             ` Andrew F. Davis
2017-12-07 17:23               ` Mark Brown
2017-11-29 21:32 ` Andrew F. Davis [this message]
     [not found] ` <20171129213300.20021-1-afd-l0cyMroinI0@public.gmane.org>
2017-11-29 21:32   ` [PATCH v2 03/19] ASoC: tlv320aic31xx: Move ACPI table next to OF table Andrew F. Davis
2017-11-30 12:32     ` Applied "ASoC: tlv320aic31xx: Move ACPI table next to OF table" to the asoc tree Mark Brown
2017-11-29 21:32   ` [PATCH v2 08/19] ASoC: tlv320aic31xx: Switch GPIO handling to use gpiod_* API Andrew F. Davis
2017-12-04 16:47     ` Andrew F. Davis
2017-12-05 21:23       ` Andrew F. Davis
2017-12-06 12:46         ` Mark Brown
2017-11-29 21:32   ` [PATCH v2 18/19] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis
     [not found]     ` <20171129213300.20021-19-afd-l0cyMroinI0@public.gmane.org>
2017-12-01 13:41       ` Mark Brown
2017-12-06 17:25         ` Andrew F. Davis
2017-12-06 17:32           ` Mark Brown
2017-12-06 17:47             ` Andrew F. Davis
2017-12-06 17:52               ` Mark Brown
2017-11-29 21:33 ` [PATCH v2 19/19] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis

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=20171129213300.20021-18-afd@ti.com \
    --to=afd@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bcousson@baylibre.com \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --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;
as well as URLs for NNTP newsgroup(s).