Unverified Commit 51e325f7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: rt1015p: delay 300ms for waiting calibration" from... 

Merge series "ASoC: rt1015p: delay 300ms for waiting calibration" from Tzung-Bi Shih <tzungbi@google.com>:

The 1st patch moves SDB control from DAI ops trigger to DAPM event
(per review comments in v1).

The 2nd patch adds the 300ms delay for waiting calibration.

Changes from v2:
- Use gpiod_set_value_cansleep() instead of gpiod_set_value().
(https://patchwork.kernel.org/project/alsa-devel/patch/20201210033617.79300-2-tzungbi@google.com/)
- Assuming the calibration state gets lost after system suspend.
(https://patchwork.kernel.org/project/alsa-devel/patch/20201210033617.79300-3-tzungbi@google.com/)

Changes from v1:
(https://patchwork.kernel.org/project/alsa-devel/patch/20201209033742.3825973-1-tzungbi@google.com/)
- Move the delay from trigger to DAPM event.

Tzung-Bi Shih (2):
  ASoC: rt1015p: move SDB control from trigger to DAPM
  ASoC: rt1015p: delay 300ms after SDB pulling high for calibration

 sound/soc/codecs/rt1015p.c | 69 ++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 37 deletions(-)

--
2.29.2.684.gfbc64c5ab5-goog
parents 45c29d9a f102d0d1

sound/soc/codecs/rt1015p.c

+32 −37
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
//

// Copyright 2020 The Linux Foundation. All rights reserved.



#include <linux/delay.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/gpio.h>
@@ -19,60 +20,46 @@ 


struct rt1015p_priv {

	struct gpio_desc *sdb;

	int sdb_switch;

	bool calib_done;

};



static int rt1015p_daiops_trigger(struct snd_pcm_substream *substream,

		int cmd, struct snd_soc_dai *dai)

static int rt1015p_sdb_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *component = dai->component;

	struct snd_soc_component *component =

		snd_soc_dapm_to_component(w->dapm);

	struct rt1015p_priv *rt1015p =

		snd_soc_component_get_drvdata(component);



	if (!rt1015p->sdb)

		return 0;



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		if (rt1015p->sdb_switch) {

			gpiod_set_value(rt1015p->sdb, 1);

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		gpiod_set_value_cansleep(rt1015p->sdb, 1);

		dev_dbg(component->dev, "set sdb to 1");



		if (!rt1015p->calib_done) {

			msleep(300);

			rt1015p->calib_done = true;

		}

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		gpiod_set_value(rt1015p->sdb, 0);

	case SND_SOC_DAPM_POST_PMD:

		gpiod_set_value_cansleep(rt1015p->sdb, 0);

		dev_dbg(component->dev, "set sdb to 0");

		break;

	default:

		break;

	}



	return 0;

}



static int rt1015p_sdb_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *component =

		snd_soc_dapm_to_component(w->dapm);

	struct rt1015p_priv *rt1015p =

		snd_soc_component_get_drvdata(component);



	if (event & SND_SOC_DAPM_POST_PMU)

		rt1015p->sdb_switch = 1;

	else if (event & SND_SOC_DAPM_POST_PMD)

		rt1015p->sdb_switch = 0;



	return 0;

}



static const struct snd_soc_dapm_widget rt1015p_dapm_widgets[] = {

	SND_SOC_DAPM_OUTPUT("Speaker"),

	SND_SOC_DAPM_OUT_DRV_E("SDB", SND_SOC_NOPM, 0, 0, NULL, 0,

			rt1015p_sdb_event,

			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

};



static const struct snd_soc_dapm_route rt1015p_dapm_routes[] = {
@@ -80,7 +67,20 @@ static const struct snd_soc_dapm_route rt1015p_dapm_routes[] = { 
	{"Speaker", NULL, "SDB"},

};



#ifdef CONFIG_PM

static int rt1015p_suspend(struct snd_soc_component *component)

{

	struct rt1015p_priv *rt1015p = snd_soc_component_get_drvdata(component);



	rt1015p->calib_done = false;

	return 0;

}

#else

#define rt1015p_suspend NULL

#endif



static const struct snd_soc_component_driver rt1015p_component_driver = {

	.suspend		= rt1015p_suspend,

	.dapm_widgets		= rt1015p_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(rt1015p_dapm_widgets),

	.dapm_routes		= rt1015p_dapm_routes,
@@ -91,10 +91,6 @@ static const struct snd_soc_component_driver rt1015p_component_driver = { 
	.non_legacy_dai_naming	= 1,

};



static const struct snd_soc_dai_ops rt1015p_dai_ops = {

	.trigger        = rt1015p_daiops_trigger,

};



static struct snd_soc_dai_driver rt1015p_dai_driver = {

	.name = "HiFi",

	.playback = {
@@ -104,7 +100,6 @@ static struct snd_soc_dai_driver rt1015p_dai_driver = { 
		.channels_min	= 1,

		.channels_max	= 2,

	},

	.ops    = &rt1015p_dai_ops,

};



static int rt1015p_platform_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE