ASoC: audio-graph-card: add hp and mic detect gpios same as simple-card

Message ID 20180608080843.11097-1-suzuki.katsuhiro@socionext.com
State New
Headers show
Series
  • ASoC: audio-graph-card: add hp and mic detect gpios same as simple-card
Related show

Commit Message

Katsuhiro Suzuki June 8, 2018, 8:08 a.m.
This patch adds headphone and microphone jack detection gpios as same
as simple-card driver. This feature move into simple-card-utils from
simple-card to avoid the duplicating code.

Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

---
 include/sound/simple_card_utils.h     | 15 +++++++
 sound/soc/generic/audio-graph-card.c  | 20 ++++++++-
 sound/soc/generic/simple-card-utils.c | 59 ++++++++++++++++++++++++
 sound/soc/generic/simple-card.c       | 64 ---------------------------
 4 files changed, 93 insertions(+), 65 deletions(-)

-- 
2.17.1

Comments

Kuninori Morimoto June 10, 2018, 11:52 p.m. | #1
Hi Katsuhiro-san

Thank you for your patch

> This patch adds headphone and microphone jack detection gpios as same

> as simple-card driver. This feature move into simple-card-utils from

> simple-card to avoid the duplicating code.

> 

> Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

> ---


I think it can be 2 patches ?
 1. move function from simple-card to simple-card-utils
 2. use it from audio-graph-card

> +static int asoc_graph_soc_card_probe(struct snd_soc_card *card)

> +{

> +	struct graph_card_data *priv = snd_soc_card_get_drvdata(card);

> +	int ret;

> +

> +	ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL);

> +	if (ret < 0)

> +		return ret;

> +

> +	ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL);

> +	if (ret < 0)

> +		return ret;

> +

> +	return 0;

> +}

> +

>  static int asoc_graph_card_probe(struct platform_device *pdev)

>  {

>  	struct graph_card_data *priv;

> @@ -319,6 +336,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)

>  	card->num_links	= num;

>  	card->dapm_widgets = asoc_graph_card_dapm_widgets;

>  	card->num_dapm_widgets = ARRAY_SIZE(asoc_graph_card_dapm_widgets);

> +	card->probe	= asoc_graph_soc_card_probe;


Current simple-card is calling init_hp/init_mic from
asoc_simple_card_dai_init(), and audio-graph-card has
asoc_graph_card_dai_init().
simple/audio card are doing samethings in different style.
Thus, I want to synchronized whole simple/audio card.

Best regards
---
Kuninori Morimoto
Katsuhiro Suzuki June 11, 2018, 2:03 a.m. | #2
Hello Morimoto-san,

Thank you for your reviewing.

On 06/11/18 08:52, Kuninori Morimoto wrote:
> 

> Hi Katsuhiro-san

> 

> Thank you for your patch

> 

>> This patch adds headphone and microphone jack detection gpios as same

>> as simple-card driver. This feature move into simple-card-utils from

>> simple-card to avoid the duplicating code.

>>

>> Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

>> ---

> 

> I think it can be 2 patches ?

>   1. move function from simple-card to simple-card-utils

>   2. use it from audio-graph-card

> 


OK, I'll split this patch.


>> +static int asoc_graph_soc_card_probe(struct snd_soc_card *card)

>> +{

>> +	struct graph_card_data *priv = snd_soc_card_get_drvdata(card);

>> +	int ret;

>> +

>> +	ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL);

>> +	if (ret < 0)

>> +		return ret;

>> +

>> +	ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL);

>> +	if (ret < 0)

>> +		return ret;

>> +

>> +	return 0;

>> +}

>> +

>>   static int asoc_graph_card_probe(struct platform_device *pdev)

>>   {

>>   	struct graph_card_data *priv;

>> @@ -319,6 +336,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)

>>   	card->num_links	= num;

>>   	card->dapm_widgets = asoc_graph_card_dapm_widgets;

>>   	card->num_dapm_widgets = ARRAY_SIZE(asoc_graph_card_dapm_widgets);

>> +	card->probe	= asoc_graph_soc_card_probe;

> 

> Current simple-card is calling init_hp/init_mic from

> asoc_simple_card_dai_init(), and audio-graph-card has

> asoc_graph_card_dai_init().

> simple/audio card are doing samethings in different style.

> Thus, I want to synchronized whole simple/audio card.

> 


Ah, right. I need to add more one patch.

   1. move function from simple-card to simple-card-utils
   2. change calling init_hp/mic from soc_dai_link.init() to
      soc_card.probe()
   3. use it from audio-graph-card


Regards,
--
Katsuhiro Suzuki


> Best regards

> ---

> Kuninori Morimoto

> _______________________________________________

> Alsa-devel mailing list

> Alsa-devel@alsa-project.org

> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

>
Katsuhiro Suzuki June 11, 2018, 2:14 a.m. | #3
Hello Morimoto-san,

Thank you for your reviewing.

> -----Original Message-----

> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> Sent: Monday, June 11, 2018 8:53 AM

> To: Suzuki, Katsuhiro <suzuki.katsuhiro@socionext.com>

> Cc: Mark Brown <broonie@kernel.org>; alsa-devel@alsa-project.org; Masami

Hiramatsu
> <masami.hiramatsu@linaro.org>; Jassi Brar <jaswinder.singh@linaro.org>;

> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH] ASoC: audio-graph-card: add hp and mic detect gpios same

as
> simple-card

> 

> 

> Hi Katsuhiro-san

> 

> Thank you for your patch

> 

> > This patch adds headphone and microphone jack detection gpios as same

> > as simple-card driver. This feature move into simple-card-utils from

> > simple-card to avoid the duplicating code.

> >

> > Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

> > ---

> 

> I think it can be 2 patches ?

>  1. move function from simple-card to simple-card-utils

>  2. use it from audio-graph-card

> 


OK, I'll split this patch.


> > +static int asoc_graph_soc_card_probe(struct snd_soc_card *card)

> > +{

> > +	struct graph_card_data *priv = snd_soc_card_get_drvdata(card);

> > +	int ret;

> > +

> > +	ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL);

> > +	if (ret < 0)

> > +		return ret;

> > +

> > +	ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL);

> > +	if (ret < 0)

> > +		return ret;

> > +

> > +	return 0;

> > +}

> > +

> >  static int asoc_graph_card_probe(struct platform_device *pdev)

> >  {

> >  	struct graph_card_data *priv;

> > @@ -319,6 +336,7 @@ static int asoc_graph_card_probe(struct platform_device

> *pdev)

> >  	card->num_links	= num;

> >  	card->dapm_widgets = asoc_graph_card_dapm_widgets;

> >  	card->num_dapm_widgets = ARRAY_SIZE(asoc_graph_card_dapm_widgets);

> > +	card->probe	= asoc_graph_soc_card_probe;

> 

> Current simple-card is calling init_hp/init_mic from

> asoc_simple_card_dai_init(), and audio-graph-card has

> asoc_graph_card_dai_init().

> simple/audio card are doing samethings in different style.

> Thus, I want to synchronized whole simple/audio card.

> 


Indeed. I need to add more one patch.

  1. move function from simple-card to simple-card-utils
  2. change calling init_hp/mic from soc_dai_link.init() to
     soc_card.probe()
  3. use it from audio-graph-card


Regards,
--
Katsuhiro Suzuki


> Best regards

> ---

> Kuninori Morimoto

Patch

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 7e25afce6566..f82acef3b992 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -12,6 +12,11 @@ 
 
 #include <sound/soc.h>
 
+#define asoc_simple_card_init_hp(card, sjack, prefix) \
+	asoc_simple_card_init_jack(card, sjack, 1, prefix)
+#define asoc_simple_card_init_mic(card, sjack, prefix) \
+	asoc_simple_card_init_jack(card, sjack, 0, prefix)
+
 struct asoc_simple_dai {
 	const char *name;
 	unsigned int sysclk;
@@ -28,6 +33,12 @@  struct asoc_simple_card_data {
 	u32 convert_channels;
 };
 
+struct asoc_simple_jack {
+	struct snd_soc_jack jack;
+	struct snd_soc_jack_pin pin;
+	struct snd_soc_jack_gpio gpio;
+};
+
 int asoc_simple_card_parse_daifmt(struct device *dev,
 				  struct device_node *node,
 				  struct device_node *codec,
@@ -107,4 +118,8 @@  int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,
 int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,
 				      char *prefix);
 
+int asoc_simple_card_init_jack(struct snd_soc_card *card,
+			       struct asoc_simple_jack *sjack,
+			       int is_hp, char *prefix);
+
 #endif /* __SIMPLE_CARD_UTILS_H */
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 1b6164249341..2baa60d3b3cc 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -21,7 +21,6 @@ 
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
-#include <sound/jack.h>
 #include <sound/simple_card_utils.h>
 
 struct graph_card_data {
@@ -32,6 +31,8 @@  struct graph_card_data {
 		unsigned int mclk_fs;
 	} *dai_props;
 	unsigned int mclk_fs;
+	struct asoc_simple_jack hp_jack;
+	struct asoc_simple_jack mic_jack;
 	struct snd_soc_dai_link *dai_link;
 	struct gpio_desc *pa_gpio;
 };
@@ -278,6 +279,22 @@  static int asoc_graph_get_dais_count(struct device *dev)
 	return count;
 }
 
+static int asoc_graph_soc_card_probe(struct snd_soc_card *card)
+{
+	struct graph_card_data *priv = snd_soc_card_get_drvdata(card);
+	int ret;
+
+	ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL);
+	if (ret < 0)
+		return ret;
+
+	ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
 static int asoc_graph_card_probe(struct platform_device *pdev)
 {
 	struct graph_card_data *priv;
@@ -319,6 +336,7 @@  static int asoc_graph_card_probe(struct platform_device *pdev)
 	card->num_links	= num;
 	card->dapm_widgets = asoc_graph_card_dapm_widgets;
 	card->num_dapm_widgets = ARRAY_SIZE(asoc_graph_card_dapm_widgets);
+	card->probe	= asoc_graph_soc_card_probe;
 
 	ret = asoc_graph_card_parse_of(priv);
 	if (ret < 0) {
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 3751a07de6aa..4398c9580929 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -8,9 +8,13 @@ 
  * published by the Free Software Foundation.
  */
 #include <linux/clk.h>
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/of_graph.h>
+#include <sound/jack.h>
 #include <sound/simple_card_utils.h>
 
 void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,
@@ -419,6 +423,61 @@  int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_of_parse_widgets);
 
+int asoc_simple_card_init_jack(struct snd_soc_card *card,
+			       struct asoc_simple_jack *sjack,
+			       int is_hp, char *prefix)
+{
+	struct device *dev = card->dev;
+	enum of_gpio_flags flags;
+	char prop[128];
+	char *pin_name;
+	char *gpio_name;
+	int mask;
+	int det;
+
+	if (!prefix)
+		prefix = "";
+
+	sjack->gpio.gpio = -ENOENT;
+
+	if (is_hp) {
+		snprintf(prop, sizeof(prop), "%shp-det-gpio", prefix);
+		pin_name	= "Headphones";
+		gpio_name	= "Headphone detection";
+		mask		= SND_JACK_HEADPHONE;
+	} else {
+		snprintf(prop, sizeof(prop), "%smic-det-gpio", prefix);
+		pin_name	= "Mic Jack";
+		gpio_name	= "Mic detection";
+		mask		= SND_JACK_MICROPHONE;
+	}
+
+	det = of_get_named_gpio_flags(dev->of_node, prop, 0, &flags);
+	if (det == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+
+	if (gpio_is_valid(det)) {
+		sjack->pin.pin		= pin_name;
+		sjack->pin.mask		= mask;
+
+		sjack->gpio.name	= gpio_name;
+		sjack->gpio.report	= mask;
+		sjack->gpio.gpio	= det;
+		sjack->gpio.invert	= !!(flags & OF_GPIO_ACTIVE_LOW);
+		sjack->gpio.debounce_time = 150;
+
+		snd_soc_card_jack_new(card, pin_name, mask,
+				      &sjack->jack,
+				      &sjack->pin, 1);
+
+		snd_soc_jack_add_gpios(&sjack->jack, 1,
+				       &sjack->gpio);
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_init_jack);
+
 /* Module information */
 MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
 MODULE_DESCRIPTION("ALSA SoC Simple Card Utils");
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 4a516c428b3d..1bbd9e46bf2a 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -10,23 +10,14 @@ 
  */
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/gpio.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
-#include <sound/jack.h>
 #include <sound/simple_card.h>
 #include <sound/soc-dai.h>
 #include <sound/soc.h>
 
-struct asoc_simple_jack {
-	struct snd_soc_jack jack;
-	struct snd_soc_jack_pin pin;
-	struct snd_soc_jack_gpio gpio;
-};
-
 struct simple_card_data {
 	struct snd_soc_card snd_card;
 	struct simple_dai_props {
@@ -49,61 +40,6 @@  struct simple_card_data {
 #define CELL	"#sound-dai-cells"
 #define PREFIX	"simple-audio-card,"
 
-#define asoc_simple_card_init_hp(card, sjack, prefix)\
-	asoc_simple_card_init_jack(card, sjack, 1, prefix)
-#define asoc_simple_card_init_mic(card, sjack, prefix)\
-	asoc_simple_card_init_jack(card, sjack, 0, prefix)
-static int asoc_simple_card_init_jack(struct snd_soc_card *card,
-				      struct asoc_simple_jack *sjack,
-				      int is_hp, char *prefix)
-{
-	struct device *dev = card->dev;
-	enum of_gpio_flags flags;
-	char prop[128];
-	char *pin_name;
-	char *gpio_name;
-	int mask;
-	int det;
-
-	sjack->gpio.gpio = -ENOENT;
-
-	if (is_hp) {
-		snprintf(prop, sizeof(prop), "%shp-det-gpio", prefix);
-		pin_name	= "Headphones";
-		gpio_name	= "Headphone detection";
-		mask		= SND_JACK_HEADPHONE;
-	} else {
-		snprintf(prop, sizeof(prop), "%smic-det-gpio", prefix);
-		pin_name	= "Mic Jack";
-		gpio_name	= "Mic detection";
-		mask		= SND_JACK_MICROPHONE;
-	}
-
-	det = of_get_named_gpio_flags(dev->of_node, prop, 0, &flags);
-	if (det == -EPROBE_DEFER)
-		return -EPROBE_DEFER;
-
-	if (gpio_is_valid(det)) {
-		sjack->pin.pin		= pin_name;
-		sjack->pin.mask		= mask;
-
-		sjack->gpio.name	= gpio_name;
-		sjack->gpio.report	= mask;
-		sjack->gpio.gpio	= det;
-		sjack->gpio.invert	= !!(flags & OF_GPIO_ACTIVE_LOW);
-		sjack->gpio.debounce_time = 150;
-
-		snd_soc_card_jack_new(card, pin_name, mask,
-				      &sjack->jack,
-				      &sjack->pin, 1);
-
-		snd_soc_jack_add_gpios(&sjack->jack, 1,
-				       &sjack->gpio);
-	}
-
-	return 0;
-}
-
 static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;