Unverified Commit 62c2c9fc authored by Katsuhiro Suzuki's avatar Katsuhiro Suzuki Committed by Mark Brown
Browse files

ASoC: simple-card-utils: move hp and mic detect gpios from simple-card 



This patch moves headphone and microphone jack detection gpios from
simple-card driver. It is preparing for using this feature from other
drivers.

Signed-off-by: default avatarKatsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d5a1826c

include/sound/simple_card_utils.h

+15 −0
Original line number Diff line number Diff line
@@ -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 */

sound/soc/generic/simple-card-utils.c

+59 −0
Original line number Diff line number Diff line
@@ -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");

sound/soc/generic/simple-card.c

+0 −64
Original line number Diff line number Diff line
@@ -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;