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 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection Date: Thu, 7 Dec 2017 09:38:59 -0600 [thread overview] Message-ID: <20171207153900.9831-10-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-1-afd@ti.com> 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 | 45 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 11 ++++++++++ 2 files changed, 56 insertions(+) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 8ee407eab81b..fef402e0f9e8 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; @@ -156,6 +158,7 @@ struct aic31xx_priv { struct gpio_desc *gpio_reset; int micbias_vg; struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES]; + struct snd_soc_jack *jack; unsigned int sysclk; u8 p_div; int rate_div_line; @@ -1149,6 +1152,20 @@ static int aic31xx_set_bias_level(struct snd_soc_codec *codec, return 0; } +int aic31xx_set_jack(struct snd_soc_codec *codec, + struct snd_soc_jack *jack, void *data) +{ + struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); + + 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_codec *codec) { struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); @@ -1174,6 +1191,7 @@ static int aic31xx_codec_probe(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_driver_aic31xx = { .probe = aic31xx_codec_probe, + .set_jack = aic31xx_set_jack, .set_bias_level = aic31xx_set_bias_level, .suspend_bias_off = true, @@ -1272,6 +1290,32 @@ static irqreturn_t aic31xx_irq(int irq, void *data) if (value & AIC31XX_HPRSCDETECT) dev_err(dev, "Short circuit on Right output is detected\n"); + if (value & AIC31XX_HSPLUG) { + int status = 0; + + ret = regmap_read(aic31xx->regmap, AIC31XX_HSDETECT, &value); + if (ret) { + dev_err(dev, "Failed to read headset type: %d\n", ret); + return IRQ_NONE; + } + + switch ((value & 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); + } + ret = regmap_read(aic31xx->regmap, AIC31XX_OFFLAG, &value); if (ret) { dev_err(dev, "Failed to read overflow flag: %d\n", ret); @@ -1360,6 +1404,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 d062663f66b5..66c85df4d5be 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, @@ -213,6 +216,14 @@ enum aic31xx_type { /* 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.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 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection Date: Thu, 7 Dec 2017 09:38:59 -0600 [thread overview] Message-ID: <20171207153900.9831-10-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-1-afd@ti.com> 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 | 45 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 11 ++++++++++ 2 files changed, 56 insertions(+) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 8ee407eab81b..fef402e0f9e8 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; @@ -156,6 +158,7 @@ struct aic31xx_priv { struct gpio_desc *gpio_reset; int micbias_vg; struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES]; + struct snd_soc_jack *jack; unsigned int sysclk; u8 p_div; int rate_div_line; @@ -1149,6 +1152,20 @@ static int aic31xx_set_bias_level(struct snd_soc_codec *codec, return 0; } +int aic31xx_set_jack(struct snd_soc_codec *codec, + struct snd_soc_jack *jack, void *data) +{ + struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); + + 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_codec *codec) { struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); @@ -1174,6 +1191,7 @@ static int aic31xx_codec_probe(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_driver_aic31xx = { .probe = aic31xx_codec_probe, + .set_jack = aic31xx_set_jack, .set_bias_level = aic31xx_set_bias_level, .suspend_bias_off = true, @@ -1272,6 +1290,32 @@ static irqreturn_t aic31xx_irq(int irq, void *data) if (value & AIC31XX_HPRSCDETECT) dev_err(dev, "Short circuit on Right output is detected\n"); + if (value & AIC31XX_HSPLUG) { + int status = 0; + + ret = regmap_read(aic31xx->regmap, AIC31XX_HSDETECT, &value); + if (ret) { + dev_err(dev, "Failed to read headset type: %d\n", ret); + return IRQ_NONE; + } + + switch ((value & 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); + } + ret = regmap_read(aic31xx->regmap, AIC31XX_OFFLAG, &value); if (ret) { dev_err(dev, "Failed to read overflow flag: %d\n", ret); @@ -1360,6 +1404,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 d062663f66b5..66c85df4d5be 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, @@ -213,6 +216,14 @@ enum aic31xx_type { /* 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.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 ` [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow " 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 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection 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-10-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.