* [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow detection support
2018-08-31 18:24 [PATCH 1/4] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
@ 2018-08-31 18:24 ` Andrew F. Davis
2018-09-03 13:03 ` Mark Brown
2018-08-31 18:24 ` [PATCH 3/4] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis
2018-08-31 18:24 ` [PATCH 4/4] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis
2 siblings, 1 reply; 7+ messages in thread
From: Andrew F. Davis @ 2018-08-31 18:24 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: alsa-devel, linux-kernel, Andrew F . Davis
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 | 34 ++++++++++++++++++++++++++++++--
sound/soc/codecs/tlv320aic31xx.h | 7 +++++++
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index d8783af7d31c..c49f6796b086 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1356,7 +1356,7 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
if (value)
handled = true;
else
- goto exit;
+ goto read_overflow;
if (value & AIC31XX_HPLSCDETECT)
dev_err(dev, "Short circuit on Left output is detected\n");
@@ -1366,6 +1366,35 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
AIC31XX_HPRSCDETECT))
dev_err(dev, "Unknown DAC interrupt flags: 0x%08x\n", value);
+read_overflow:
+ ret = regmap_read(aic31xx->regmap, AIC31XX_OFFLAG, &value);
+ if (ret) {
+ dev_err(dev, "Failed to read overflow flag: %d\n", ret);
+ goto exit;
+ }
+
+ if (value)
+ handled = true;
+ else
+ goto exit;
+
+ 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");
+ if (value & ~(AIC31XX_DAC_OF_LEFT |
+ AIC31XX_DAC_OF_RIGHT |
+ AIC31XX_DAC_OF_SHIFTER |
+ AIC31XX_ADC_OF |
+ AIC31XX_ADC_OF_SHIFTER))
+ dev_err(dev, "Unknown overflow interrupt flags: 0x%08x\n", value);
+
exit:
if (handled)
return IRQ_HANDLED;
@@ -1447,7 +1476,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 52e171988906..2636f2c6bc79 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -173,6 +173,13 @@ struct aic31xx_pdata {
#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.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow detection support
2018-08-31 18:24 ` [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis
@ 2018-09-03 13:03 ` Mark Brown
2018-09-04 14:38 ` Andrew F. Davis
0 siblings, 1 reply; 7+ messages in thread
From: Mark Brown @ 2018-09-03 13:03 UTC (permalink / raw)
To: Andrew F. Davis; +Cc: Liam Girdwood, alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
On Fri, Aug 31, 2018 at 01:24:32PM -0500, Andrew F. Davis wrote:
> 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.
> + 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");
So, this will sound terrible but I'm not sure that unconditionally
shouting in the logs is the right thing to do here - people do sometimes
put non-audio signals through sound cards (using them as generic DACs
and ADCs) and it seems like it could get very spammy. Perhaps a lower
level warning message, some counters or even some control that allows
the warnings to be masked.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow detection support
2018-09-03 13:03 ` Mark Brown
@ 2018-09-04 14:38 ` Andrew F. Davis
0 siblings, 0 replies; 7+ messages in thread
From: Andrew F. Davis @ 2018-09-04 14:38 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, alsa-devel, linux-kernel
On 09/03/2018 08:03 AM, Mark Brown wrote:
> On Fri, Aug 31, 2018 at 01:24:32PM -0500, Andrew F. Davis wrote:
>> 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.
>
>> + 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");
>
> So, this will sound terrible but I'm not sure that unconditionally
> shouting in the logs is the right thing to do here - people do sometimes
> put non-audio signals through sound cards (using them as generic DACs
> and ADCs) and it seems like it could get very spammy. Perhaps a lower
> level warning message, some counters or even some control that allows
> the warnings to be masked.
>
As these events do not stop the function of the sound card, I agree
warnings would be more appropriate than errors, I'll make that change.
Andrew
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] ASoC: tlv320aic31xx: Add headphone/headset detection
2018-08-31 18:24 [PATCH 1/4] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
2018-08-31 18:24 ` [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis
@ 2018-08-31 18:24 ` Andrew F. Davis
2018-09-03 13:05 ` Mark Brown
2018-08-31 18:24 ` [PATCH 4/4] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis
2 siblings, 1 reply; 7+ messages in thread
From: Andrew F. Davis @ 2018-08-31 18:24 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: alsa-devel, linux-kernel, Andrew F . Davis
This device can detect the insertion/removal of headphones and headsets.
Enable reporting this status by enabling this interrupt and forwarding
this to upper-layers if a jack has been defined.
This jack definition and the resulting operation from a jack detection
event must currently be defined by sound card platform code until CODEC
outputs to jack mappings can be defined generically.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
sound/soc/codecs/tlv320aic31xx.c | 48 +++++++++++++++++++++++++++++++-
sound/soc/codecs/tlv320aic31xx.h | 11 ++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index c49f6796b086..0e57c7bbbabb 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -25,6 +25,7 @@
#include <linux/of_gpio.h>
#include <linux/slab.h>
#include <sound/core.h>
+#include <sound/jack.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -89,6 +90,7 @@ static bool aic31xx_volatile(struct device *dev, unsigned int reg)
case AIC31XX_INTRADCFLAG: /* Sticky interrupt flags */
case AIC31XX_INTRDACFLAG2:
case AIC31XX_INTRADCFLAG2:
+ case AIC31XX_HSDETECT:
return true;
}
return false;
@@ -157,6 +159,7 @@ struct aic31xx_priv {
int micbias_vg;
struct aic31xx_pdata pdata;
struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES];
+ struct snd_soc_jack *jack;
unsigned int sysclk;
u8 p_div;
int rate_div_line;
@@ -1233,6 +1236,20 @@ static int aic31xx_set_bias_level(struct snd_soc_component *component,
return 0;
}
+int aic31xx_set_jack(struct snd_soc_component *component,
+ struct snd_soc_jack *jack, void *data)
+{
+ struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component);
+
+ aic31xx->jack = jack;
+
+ /* Enable/Disable jack detection */
+ regmap_write(aic31xx->regmap, AIC31XX_HSDETECT,
+ jack ? AIC31XX_HSD_ENABLE : 0);
+
+ return 0;
+}
+
static int aic31xx_codec_probe(struct snd_soc_component *component)
{
struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component);
@@ -1258,6 +1275,7 @@ static int aic31xx_codec_probe(struct snd_soc_component *component)
static const struct snd_soc_component_driver soc_codec_driver_aic31xx = {
.probe = aic31xx_codec_probe,
+ .set_jack = aic31xx_set_jack,
.set_bias_level = aic31xx_set_bias_level,
.controls = common31xx_snd_controls,
.num_controls = ARRAY_SIZE(common31xx_snd_controls),
@@ -1362,8 +1380,35 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
dev_err(dev, "Short circuit on Left output is detected\n");
if (value & AIC31XX_HPRSCDETECT)
dev_err(dev, "Short circuit on Right output is detected\n");
+ if (value & AIC31XX_HSPLUG) {
+ unsigned int val;
+ int status = 0;
+
+ ret = regmap_read(aic31xx->regmap, AIC31XX_HSDETECT, &val);
+ if (ret) {
+ dev_err(dev, "Failed to read headset type: %d\n", ret);
+ goto exit;
+ }
+
+ switch ((val & AIC31XX_HSD_TYPE_MASK) >>
+ AIC31XX_HSD_TYPE_SHIFT) {
+ case AIC31XX_HSD_HP:
+ status |= SND_JACK_HEADPHONE;
+ break;
+ case AIC31XX_HSD_HS:
+ status |= SND_JACK_HEADSET;
+ break;
+ default:
+ break;
+ }
+
+ if (aic31xx->jack)
+ snd_soc_jack_report(aic31xx->jack, status,
+ AIC31XX_JACK_MASK);
+ }
if (value & ~(AIC31XX_HPLSCDETECT |
- AIC31XX_HPRSCDETECT))
+ AIC31XX_HPRSCDETECT |
+ AIC31XX_HSPLUG))
dev_err(dev, "Unknown DAC interrupt flags: 0x%08x\n", value);
read_overflow:
@@ -1476,6 +1521,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
AIC31XX_GPIO1_FUNC_SHIFT);
regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL,
+ AIC31XX_HSPLUGDET |
AIC31XX_SC |
AIC31XX_ENGINE);
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 2636f2c6bc79..9985ceed97ae 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -20,6 +20,9 @@
#define AIC31XX_MINIDSP_BIT BIT(2)
#define DAC31XX_BIT BIT(3)
+#define AIC31XX_JACK_MASK (SND_JACK_HEADPHONE | \
+ SND_JACK_HEADSET)
+
enum aic31xx_type {
AIC3100 = 0,
AIC3110 = AIC31XX_STEREO_CLASS_D_BIT,
@@ -220,6 +223,14 @@ struct aic31xx_pdata {
/* AIC31XX_DACMUTE */
#define AIC31XX_DACMUTE_MASK GENMASK(3, 2)
+/* AIC31XX_HSDETECT */
+#define AIC31XX_HSD_ENABLE BIT(7)
+#define AIC31XX_HSD_TYPE_MASK GENMASK(6, 5)
+#define AIC31XX_HSD_TYPE_SHIFT 5
+#define AIC31XX_HSD_NONE 0x00
+#define AIC31XX_HSD_HP 0x01
+#define AIC31XX_HSD_HS 0x03
+
/* AIC31XX_MICBIAS */
#define AIC31XX_MICBIAS_MASK GENMASK(1, 0)
#define AIC31XX_MICBIAS_SHIFT 0
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] ASoC: tlv320aic31xx: Add button press detection
2018-08-31 18:24 [PATCH 1/4] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
2018-08-31 18:24 ` [PATCH 2/4] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis
2018-08-31 18:24 ` [PATCH 3/4] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis
@ 2018-08-31 18:24 ` Andrew F. Davis
2 siblings, 0 replies; 7+ messages in thread
From: Andrew F. Davis @ 2018-08-31 18:24 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: alsa-devel, linux-kernel, Andrew F . Davis
This device can optionally detect headset or microphone button presses.
Add support for this by passing this event to the jack layer.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
sound/soc/codecs/tlv320aic31xx.c | 17 +++++++++++++++--
sound/soc/codecs/tlv320aic31xx.h | 3 ++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 0e57c7bbbabb..e6e139aecc44 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1380,10 +1380,21 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
dev_err(dev, "Short circuit on Left output is detected\n");
if (value & AIC31XX_HPRSCDETECT)
dev_err(dev, "Short circuit on Right output is detected\n");
- if (value & AIC31XX_HSPLUG) {
+ if (value & (AIC31XX_HSPLUG | AIC31XX_BUTTONPRESS)) {
unsigned int val;
int status = 0;
+ ret = regmap_read(aic31xx->regmap, AIC31XX_INTRDACFLAG2,
+ &val);
+ if (ret) {
+ dev_err(dev, "Failed to read interrupt mask: %d\n",
+ ret);
+ goto exit;
+ }
+
+ if (val & AIC31XX_BUTTONPRESS)
+ status |= SND_JACK_BTN_0;
+
ret = regmap_read(aic31xx->regmap, AIC31XX_HSDETECT, &val);
if (ret) {
dev_err(dev, "Failed to read headset type: %d\n", ret);
@@ -1408,7 +1419,8 @@ static irqreturn_t aic31xx_irq(int irq, void *data)
}
if (value & ~(AIC31XX_HPLSCDETECT |
AIC31XX_HPRSCDETECT |
- AIC31XX_HSPLUG))
+ AIC31XX_HSPLUG |
+ AIC31XX_BUTTONPRESS))
dev_err(dev, "Unknown DAC interrupt flags: 0x%08x\n", value);
read_overflow:
@@ -1522,6 +1534,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL,
AIC31XX_HSPLUGDET |
+ AIC31XX_BUTTONPRESSDET |
AIC31XX_SC |
AIC31XX_ENGINE);
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 9985ceed97ae..cb024955c978 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -21,7 +21,8 @@
#define DAC31XX_BIT BIT(3)
#define AIC31XX_JACK_MASK (SND_JACK_HEADPHONE | \
- SND_JACK_HEADSET)
+ SND_JACK_HEADSET | \
+ SND_JACK_BTN_0)
enum aic31xx_type {
AIC3100 = 0,
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread