From: "Andrew F. Davis" <afd@ti.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, "Andrew F . Davis" <afd@ti.com> Subject: [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow detection support Date: Thu, 7 Dec 2017 09:38:58 -0600 [thread overview] Message-ID: <20171207153900.9831-9-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-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 500284853a5c..8ee407eab81b 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1272,6 +1272,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; } @@ -1343,7 +1360,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
WARNING: multiple messages have this Message-ID (diff)
From: "Andrew F. Davis" <afd@ti.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, "Andrew F . Davis" <afd@ti.com> Subject: [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow detection support Date: Thu, 7 Dec 2017 09:38:58 -0600 [thread overview] Message-ID: <20171207153900.9831-9-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-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 500284853a5c..8ee407eab81b 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1272,6 +1272,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; } @@ -1343,7 +1360,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
next prev parent reply other threads:[~2017-12-07 15:39 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-07 15:38 [PATCH v3 00/10] Add Headphone Detection to TLV320AIC31xx Driver Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 01/10] ASoC: tlv320aic31xx: Fix GPIO header includes Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Fix GPIO header includes" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 02/10] ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 03/10] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 04/10] ASoC: tlv320aic31xx: Add MICBIAS off setting Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 05/10] ASoC: tlv320aic31xx: Remove regulator notification handling Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 06/10] ASoC: tlv320aic31xx: Reset registers during power up Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Reset registers during power up" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 07/10] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis [this message] 2017-12-07 15:38 ` [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:39 ` [PATCH v3 10/10] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis 2017-12-07 15:39 ` 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=20171207153900.9831-9-afd@ti.com \ --to=afd@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ /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.