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 16/19] ASoC: tlv320aic31xx: Add short circuit detection support Date: Wed, 29 Nov 2017 15:32:57 -0600 [thread overview] Message-ID: <20171129213300.20021-17-afd@ti.com> (raw) In-Reply-To: <20171129213300.20021-1-afd@ti.com> These devices support detecting and reporting short circuits across the output stages. Add support for reporting these issue. Do this by registering an interrupt if available and enabling this error to trigger that interrupt in the device. Signed-off-by: Andrew F. Davis <afd@ti.com> --- sound/soc/codecs/tlv320aic31xx.c | 42 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 16 +++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 77ae8f36a943..fd3109366377 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -164,6 +164,7 @@ struct aic31xx_priv { unsigned int sysclk; u8 p_div; int rate_div_line; + int irq; }; struct aic31xx_rate_divs { @@ -1258,6 +1259,27 @@ static const struct acpi_device_id aic31xx_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match); #endif +static irqreturn_t aic31xx_irq(int irq, void *data) +{ + struct aic31xx_priv *aic31xx = (struct aic31xx_priv *)data; + struct device *dev = aic31xx->dev; + unsigned int value; + int ret; + + ret = regmap_read(aic31xx->regmap, AIC31XX_INTRDACFLAG, &value); + if (ret) { + dev_err(dev, "Failed to read interrupt mask: %d\n", ret); + return IRQ_NONE; + } + + if (value & AIC31XX_HPLSCDETECT) + 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"); + + return IRQ_HANDLED; +} + static int aic31xx_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1280,6 +1302,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, return ret; } aic31xx->dev = &i2c->dev; + aic31xx->irq = i2c->irq; aic31xx->codec_type = id->driver_data; @@ -1318,6 +1341,25 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, return ret; } + if (aic31xx->irq > 0) { + regmap_update_bits(aic31xx->regmap, AIC31XX_GPIO1, + AIC31XX_GPIO1_FUNC_MASK, + AIC31XX_GPIO1_INT1 << + AIC31XX_GPIO1_FUNC_SHIFT); + + regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL, + AIC31XX_SC); + + ret = devm_request_threaded_irq(aic31xx->dev, aic31xx->irq, + NULL, aic31xx_irq, + IRQF_ONESHOT, "aic31xx-irq", + aic31xx); + if (ret) { + dev_err(aic31xx->dev, "Unable to request IRQ\n"); + return ret; + } + } + if (aic31xx->codec_type & DAC31XX_BIT) return snd_soc_register_codec(&i2c->dev, &soc_codec_driver_aic31xx, diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index ab94e6a0c742..9dc85b6f6ad3 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -184,6 +184,22 @@ enum aic31xx_type { #define AIC31XX_SC BIT(3) #define AIC31XX_ENGINE BIT(2) +/* AIC31XX_GPIO1 */ +#define AIC31XX_GPIO1_FUNC_MASK GENMASK(5, 2) +#define AIC31XX_GPIO1_FUNC_SHIFT 2 +#define AIC31XX_GPIO1_DISABLED 0x00 +#define AIC31XX_GPIO1_INPUT 0x01 +#define AIC31XX_GPIO1_GPI 0x02 +#define AIC31XX_GPIO1_GPO 0x03 +#define AIC31XX_GPIO1_CLKOUT 0x04 +#define AIC31XX_GPIO1_INT1 0x05 +#define AIC31XX_GPIO1_INT2 0x06 +#define AIC31XX_GPIO1_ADC_WCLK 0x07 +#define AIC31XX_GPIO1_SBCLK 0x08 +#define AIC31XX_GPIO1_SWCLK 0x09 +#define AIC31XX_GPIO1_ADC_MOD_CLK 0x10 +#define AIC31XX_GPIO1_SDOUT 0x11 + /* AIC31XX_DACSETUP */ #define AIC31XX_SOFTSTEP_MASK GENMASK(1, 0) -- 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>, "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 16/19] ASoC: tlv320aic31xx: Add short circuit detection support Date: Wed, 29 Nov 2017 15:32:57 -0600 [thread overview] Message-ID: <20171129213300.20021-17-afd@ti.com> (raw) In-Reply-To: <20171129213300.20021-1-afd@ti.com> These devices support detecting and reporting short circuits across the output stages. Add support for reporting these issue. Do this by registering an interrupt if available and enabling this error to trigger that interrupt in the device. Signed-off-by: Andrew F. Davis <afd@ti.com> --- sound/soc/codecs/tlv320aic31xx.c | 42 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 16 +++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 77ae8f36a943..fd3109366377 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -164,6 +164,7 @@ struct aic31xx_priv { unsigned int sysclk; u8 p_div; int rate_div_line; + int irq; }; struct aic31xx_rate_divs { @@ -1258,6 +1259,27 @@ static const struct acpi_device_id aic31xx_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match); #endif +static irqreturn_t aic31xx_irq(int irq, void *data) +{ + struct aic31xx_priv *aic31xx = (struct aic31xx_priv *)data; + struct device *dev = aic31xx->dev; + unsigned int value; + int ret; + + ret = regmap_read(aic31xx->regmap, AIC31XX_INTRDACFLAG, &value); + if (ret) { + dev_err(dev, "Failed to read interrupt mask: %d\n", ret); + return IRQ_NONE; + } + + if (value & AIC31XX_HPLSCDETECT) + 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"); + + return IRQ_HANDLED; +} + static int aic31xx_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1280,6 +1302,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, return ret; } aic31xx->dev = &i2c->dev; + aic31xx->irq = i2c->irq; aic31xx->codec_type = id->driver_data; @@ -1318,6 +1341,25 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, return ret; } + if (aic31xx->irq > 0) { + regmap_update_bits(aic31xx->regmap, AIC31XX_GPIO1, + AIC31XX_GPIO1_FUNC_MASK, + AIC31XX_GPIO1_INT1 << + AIC31XX_GPIO1_FUNC_SHIFT); + + regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL, + AIC31XX_SC); + + ret = devm_request_threaded_irq(aic31xx->dev, aic31xx->irq, + NULL, aic31xx_irq, + IRQF_ONESHOT, "aic31xx-irq", + aic31xx); + if (ret) { + dev_err(aic31xx->dev, "Unable to request IRQ\n"); + return ret; + } + } + if (aic31xx->codec_type & DAC31XX_BIT) return snd_soc_register_codec(&i2c->dev, &soc_codec_driver_aic31xx, diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index ab94e6a0c742..9dc85b6f6ad3 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -184,6 +184,22 @@ enum aic31xx_type { #define AIC31XX_SC BIT(3) #define AIC31XX_ENGINE BIT(2) +/* AIC31XX_GPIO1 */ +#define AIC31XX_GPIO1_FUNC_MASK GENMASK(5, 2) +#define AIC31XX_GPIO1_FUNC_SHIFT 2 +#define AIC31XX_GPIO1_DISABLED 0x00 +#define AIC31XX_GPIO1_INPUT 0x01 +#define AIC31XX_GPIO1_GPI 0x02 +#define AIC31XX_GPIO1_GPO 0x03 +#define AIC31XX_GPIO1_CLKOUT 0x04 +#define AIC31XX_GPIO1_INT1 0x05 +#define AIC31XX_GPIO1_INT2 0x06 +#define AIC31XX_GPIO1_ADC_WCLK 0x07 +#define AIC31XX_GPIO1_SBCLK 0x08 +#define AIC31XX_GPIO1_SWCLK 0x09 +#define AIC31XX_GPIO1_ADC_MOD_CLK 0x10 +#define AIC31XX_GPIO1_SDOUT 0x11 + /* AIC31XX_DACSETUP */ #define AIC31XX_SOFTSTEP_MASK GENMASK(1, 0) -- 2.15.0
next prev parent reply other threads:[~2017-11-29 21:34 UTC|newest] Thread overview: 116+ 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 ` Andrew F. Davis 2017-11-29 21:32 ` [PATCH v2 01/19] ASoC: tlv320aic31xx: File header and copyright cleanup Andrew F. Davis 2017-11-29 21:32 ` Andrew F. Davis 2017-11-30 12:29 ` Mark Brown 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-29 21:32 ` 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 03/19] ASoC: tlv320aic31xx: Move ACPI table next to OF table Andrew F. Davis 2017-11-29 21:32 ` 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 04/19] ASoC: tlv320aic31xx: General source formatting cleanup Andrew F. Davis 2017-11-29 21:32 ` 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-29 21:32 ` 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 ` 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 ` Andrew F. Davis 2017-11-29 21:32 ` [PATCH v2 08/19] ASoC: tlv320aic31xx: Switch GPIO handling to use gpiod_* API Andrew F. Davis 2017-11-29 21:32 ` Andrew F. Davis 2017-12-04 16:47 ` Andrew F. Davis 2017-12-04 16:47 ` Andrew F. Davis 2017-12-05 21:23 ` Andrew F. Davis 2017-12-05 21:23 ` Andrew F. Davis 2017-12-06 12:46 ` Mark Brown 2017-12-06 12:46 ` Mark Brown 2017-11-29 21:32 ` [PATCH v2 09/19] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis 2017-11-29 21:32 ` Andrew F. Davis 2017-12-01 13:26 ` Mark Brown 2017-12-01 13:26 ` Mark Brown 2017-12-05 21:20 ` Andrew F. Davis 2017-12-05 21:20 ` Andrew F. Davis 2017-12-06 12:45 ` Mark Brown 2017-12-06 12:45 ` Mark Brown 2017-12-06 16:19 ` Andrew F. Davis 2017-12-06 16:19 ` Andrew F. Davis 2017-12-06 17:30 ` Mark Brown 2017-12-06 17:30 ` Mark Brown 2017-12-06 17:48 ` Andrew F. Davis 2017-12-06 17:48 ` Andrew F. Davis 2017-12-06 18:15 ` Mark Brown 2017-12-06 18:15 ` Mark Brown 2017-12-06 18:40 ` Andrew F. Davis 2017-12-06 18:40 ` Andrew F. Davis 2017-12-06 19:11 ` Mark Brown 2017-12-06 19:11 ` Mark Brown 2017-12-06 19:15 ` Andrew F. Davis 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 2017-11-29 21:32 ` Andrew F. Davis 2017-12-01 13:30 ` Mark Brown 2017-12-01 13:30 ` Mark Brown 2017-12-01 14:56 ` Andrew F. Davis 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 ` Andrew F. Davis 2017-11-29 21:32 ` [PATCH v2 12/19] ASoC: tlv320aic31xx: Add CODEC clock slave support Andrew F. Davis 2017-11-29 21:32 ` 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-11-29 21:32 ` 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-11-29 21:32 ` Andrew F. Davis 2017-12-01 13:36 ` Mark Brown 2017-12-01 15:01 ` Andrew F. Davis 2017-12-01 15:01 ` Andrew F. Davis 2017-12-01 15:55 ` Mark Brown 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-11-29 21:32 ` Andrew F. Davis 2017-12-01 13:37 ` Mark Brown 2017-12-01 13:37 ` Mark Brown 2017-12-01 15:04 ` Andrew F. Davis 2017-12-01 15:04 ` Andrew F. Davis 2017-12-01 15:55 ` Mark Brown 2017-11-29 21:32 ` Andrew F. Davis [this message] 2017-11-29 21:32 ` [PATCH v2 16/19] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis 2017-12-01 13:39 ` Mark Brown 2017-12-01 13:39 ` Mark Brown 2017-12-01 15:32 ` Andrew F. Davis 2017-12-01 15:32 ` Andrew F. Davis 2017-12-01 15:57 ` Mark Brown 2017-12-01 15:57 ` Mark Brown 2017-12-06 17:15 ` Andrew F. Davis 2017-12-06 17:15 ` Andrew F. Davis 2017-12-06 20:22 ` Andrew F. Davis 2017-12-06 20:22 ` Andrew F. Davis 2017-12-07 12:03 ` Mark Brown 2017-12-07 12:03 ` Mark Brown 2017-12-07 15:37 ` Andrew F. Davis 2017-12-07 15:37 ` Andrew F. Davis 2017-12-07 17:23 ` Mark Brown 2017-12-07 17:23 ` Mark Brown 2017-11-29 21:32 ` [PATCH v2 17/19] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis 2017-11-29 21:32 ` Andrew F. Davis 2017-11-29 21:32 ` [PATCH v2 18/19] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis 2017-11-29 21:32 ` Andrew F. Davis 2017-12-01 13:41 ` Mark Brown 2017-12-01 13:41 ` Mark Brown 2017-12-06 17:25 ` Andrew F. Davis 2017-12-06 17:25 ` Andrew F. Davis 2017-12-06 17:32 ` Mark Brown 2017-12-06 17:32 ` Mark Brown 2017-12-06 17:47 ` Andrew F. Davis 2017-12-06 17:47 ` Andrew F. Davis 2017-12-06 17:52 ` Mark Brown 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 2017-11-29 21:33 ` 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-17-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: 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.