[PATCH] ASoC: cs53l30: Add MUTE pin control support via GPIO

[PATCH] ASoC: cs53l30: Add MUTE pin control support via GPIO

[Nicolin Chen]

The codec chip has a physical MUTE pin to let users control it via
GPIO. So this patch add a mute control support to the driver.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
 .../devicetree/bindings/sound/cs53l30.txt          |  2 ++
 sound/soc/codecs/cs53l30.c                         | 30 ++++++++++++++++++++++
 sound/soc/codecs/cs53l30.h                         |  1 +
 3 files changed, 33 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/cs53l30.txt b/Documentation/devicetree/bindings/sound/cs53l30.txt
index 18d6b99..6f7d3c8 100644
--- a/Documentation/devicetree/bindings/sound/cs53l30.txt
+++ b/Documentation/devicetree/bindings/sound/cs53l30.txt
@@ -13,6 +13,8 @@ Optional properties:
 
   - reset-gpios : a GPIO spec for the reset pin.
 
+  - mute-gpios : a GPIO spec for the MUTE pin.
+
   - cirrus,micbias-lvl : Set the output voltage level on the MICBIAS Pin.
 			 0 = Hi-Z
 			 1 = 1.80 V
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index b0a64a1..5988b5c 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -35,6 +35,7 @@ struct cs53l30_private {
 	struct regulator_bulk_data	supplies[CS53L30_NUM_SUPPLIES];
 	struct regmap			*regmap;
 	struct gpio_desc		*reset_gpio;
+	struct gpio_desc		*mute_gpio;
 	struct clk			*mclk;
 	bool				use_sdout2;
 	u32				mclk_rate;
@@ -833,6 +834,16 @@ static int cs53l30_set_dai_tdm_slot(struct snd_soc_dai *dai,
 	return 0;
 }
 
+static int cs53l30_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
+{
+	struct cs53l30_private *priv = snd_soc_codec_get_drvdata(dai->codec);
+
+	if (priv->mute_gpio)
+		gpiod_set_value_cansleep(priv->mute_gpio, mute);
+
+	return 0;
+}
+
 /* SNDRV_PCM_RATE_KNOT -> 12000, 24000 Hz, limit with constraint list */
 #define CS53L30_RATES (SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_KNOT)
 
@@ -846,6 +857,7 @@ static const struct snd_soc_dai_ops cs53l30_ops = {
 	.set_sysclk = cs53l30_set_sysclk,
 	.set_tristate = cs53l30_set_tristate,
 	.set_tdm_slot = cs53l30_set_dai_tdm_slot,
+	.mute_stream = cs53l30_mute_stream,
 };
 
 static struct snd_soc_dai_driver cs53l30_dai = {
@@ -991,6 +1003,24 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
 		cs53l30->mclk = NULL;
 	}
 
+	/* Fetch the MUTE control */
+	cs53l30->mute_gpio = devm_gpiod_get_optional(dev, "mute",
+						     GPIOD_OUT_HIGH);
+	if (IS_ERR(cs53l30->mute_gpio)) {
+		ret = PTR_ERR(cs53l30->mute_gpio);
+		goto error;
+	}
+
+	if (cs53l30->mute_gpio) {
+		/* Enable MUTE controls via MUTE pin */
+		regmap_write(cs53l30->regmap, CS53L30_MUTEP_CTL1,
+			     CS53L30_MUTEP_CTL1_MUTEALL);
+		/* Flip the polarity of MUTE pin */
+		if (gpiod_is_active_low(cs53l30->mute_gpio))
+			regmap_update_bits(cs53l30->regmap, CS53L30_MUTEP_CTL2,
+					   CS53L30_MUTE_PIN_POLARITY, 0);
+	}
+
 	if (!of_property_read_u8(np, "cirrus,micbias-lvl", &val))
 		regmap_update_bits(cs53l30->regmap, CS53L30_MICBIAS_CTL,
 				   CS53L30_MIC_BIAS_CTRL_MASK, val);
diff --git a/sound/soc/codecs/cs53l30.h b/sound/soc/codecs/cs53l30.h
index 0dd4afb..5e39da5 100644
--- a/sound/soc/codecs/cs53l30.h
+++ b/sound/soc/codecs/cs53l30.h
@@ -253,6 +253,7 @@
 #define CS53L30_MUTE_MB_ALL_PDN_MASK	(1 << CS53L30_MUTE_MB_ALL_PDN_SHIFT)
 #define CS53L30_MUTE_MB_ALL_PDN		(1 << CS53L30_MUTE_MB_ALL_PDN_SHIFT)
 
+#define CS53L30_MUTEP_CTL1_MUTEALL	(0xdf)
 #define CS53L30_MUTEP_CTL1_DEFAULT	(0)
 
 /* R32 (0x20) CS53L30_MUTEP_CTL2 - MUTE Pin Control 2 */
-- 
2.1.4

Re: [PATCH] ASoC: cs53l30: Add MUTE pin control support via GPIO

[Rob Herring]

On Mon, Jun 20, 2016 at 06:54:44PM -0700, Nicolin Chen wrote:
> The codec chip has a physical MUTE pin to let users control it via
> GPIO. So this patch add a mute control support to the driver.
> 
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
>  .../devicetree/bindings/sound/cs53l30.txt          |  2 ++
>  sound/soc/codecs/cs53l30.c                         | 30 ++++++++++++++++++++++
>  sound/soc/codecs/cs53l30.h                         |  1 +
>  3 files changed, 33 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/sound/cs53l30.txt b/Documentation/devicetree/bindings/sound/cs53l30.txt
> index 18d6b99..6f7d3c8 100644
> --- a/Documentation/devicetree/bindings/sound/cs53l30.txt
> +++ b/Documentation/devicetree/bindings/sound/cs53l30.txt
> @@ -13,6 +13,8 @@ Optional properties:
>  
>    - reset-gpios : a GPIO spec for the reset pin.
>  
> +  - mute-gpios : a GPIO spec for the MUTE pin.

Please define the active state for the gpio.

> +
>    - cirrus,micbias-lvl : Set the output voltage level on the MICBIAS Pin.
>  			 0 = Hi-Z
>  			 1 = 1.80 V

Re: [PATCH] ASoC: cs53l30: Add MUTE pin control support via GPIO

[Nicolin Chen]

On Tue, Jun 21, 2016 at 04:34:37PM -0500, Rob Herring wrote:
> On Mon, Jun 20, 2016 at 06:54:44PM -0700, Nicolin Chen wrote:
> > The codec chip has a physical MUTE pin to let users control it via
> > GPIO. So this patch add a mute control support to the driver.
> > 
> > Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> > ---
> >  .../devicetree/bindings/sound/cs53l30.txt          |  2 ++
> >  sound/soc/codecs/cs53l30.c                         | 30 ++++++++++++++++++++++
> >  sound/soc/codecs/cs53l30.h                         |  1 +
> >  3 files changed, 33 insertions(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/sound/cs53l30.txt b/Documentation/devicetree/bindings/sound/cs53l30.txt
> > index 18d6b99..6f7d3c8 100644
> > --- a/Documentation/devicetree/bindings/sound/cs53l30.txt
> > +++ b/Documentation/devicetree/bindings/sound/cs53l30.txt
> > @@ -13,6 +13,8 @@ Optional properties:
> >  
> >    - reset-gpios : a GPIO spec for the reset pin.
> >  
> > +  - mute-gpios : a GPIO spec for the MUTE pin.
> 
> Please define the active state for the gpio.

The active state here is programmable and being taken care by the
driver automatically. Maybe I should have mentioned this in the
binding as well?

Thanks
Nic