Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e96cb484 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/dapm' of... 

Merge branch 'fix/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
parents 30ac6b6e 11391100

drivers/extcon/extcon-arizona.c

+0 −12
Original line number Diff line number Diff line
@@ -222,27 +222,19 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info) 
	struct snd_soc_dapm_context *dapm = arizona->dapm;

	int ret;



	mutex_lock(&dapm->card->dapm_mutex);



	ret = snd_soc_dapm_force_enable_pin(dapm, widget);

	if (ret != 0)

		dev_warn(arizona->dev, "Failed to enable %s: %d\n",

			 widget, ret);



	mutex_unlock(&dapm->card->dapm_mutex);



	snd_soc_dapm_sync(dapm);



	if (!arizona->pdata.micd_force_micbias) {

		mutex_lock(&dapm->card->dapm_mutex);



		ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);

		if (ret != 0)

			dev_warn(arizona->dev, "Failed to disable %s: %d\n",

				 widget, ret);



		mutex_unlock(&dapm->card->dapm_mutex);



		snd_soc_dapm_sync(dapm);

	}

}
@@ -304,16 +296,12 @@ static void arizona_stop_mic(struct arizona_extcon_info *info) 
				 ARIZONA_MICD_ENA, 0,

				 &change);



	mutex_lock(&dapm->card->dapm_mutex);



	ret = snd_soc_dapm_disable_pin(dapm, widget);

	if (ret != 0)

		dev_warn(arizona->dev,

			 "Failed to disable %s: %d\n",

			 widget, ret);



	mutex_unlock(&dapm->card->dapm_mutex);



	snd_soc_dapm_sync(dapm);



	if (info->micd_reva) {

drivers/input/misc/arizona-haptics.c

+0 −19
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static void arizona_haptics_work(struct work_struct *work) 
						       struct arizona_haptics,

						       work);

	struct arizona *arizona = haptics->arizona;

	struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;

	int ret;



	if (!haptics->arizona->dapm) {
@@ -67,13 +66,10 @@ static void arizona_haptics_work(struct work_struct *work) 
			return;

		}



		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}
@@ -81,21 +77,14 @@ static void arizona_haptics_work(struct work_struct *work) 
		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		mutex_unlock(dapm_mutex);



	} else {

		/* This disable sequence will be a noop if already enabled */

		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}
@@ -103,12 +92,9 @@ static void arizona_haptics_work(struct work_struct *work) 
		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		mutex_unlock(dapm_mutex);



		ret = regmap_update_bits(arizona->regmap,

					 ARIZONA_HAPTICS_CONTROL_1,

					 ARIZONA_HAP_CTRL_MASK,
@@ -155,16 +141,11 @@ static int arizona_haptics_play(struct input_dev *input, void *data, 
static void arizona_haptics_close(struct input_dev *input)

{

	struct arizona_haptics *haptics = input_get_drvdata(input);

	struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex;



	cancel_work_sync(&haptics->work);



	mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	if (haptics->arizona->dapm)

		snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");



	mutex_unlock(dapm_mutex);

}



static int arizona_haptics_probe(struct platform_device *pdev)

include/sound/soc-dapm.h

+8 −0
Original line number Diff line number Diff line
@@ -449,14 +449,22 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, 
/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,

			    const char *pin);

int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				     const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,

			     const char *pin);

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				      const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm,

				 const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

				const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin);

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

					   const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);

sound/soc/soc-dapm.c

+126 −13
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, 
			ret = regulator_allow_bypass(w->regulator, false);

			if (ret != 0)

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to bypass %s: %d\n",

					 "ASoC: Failed to unbypass %s: %d\n",

					 w->name, ret);

		}
@@ -1229,7 +1229,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, 
			ret = regulator_allow_bypass(w->regulator, true);

			if (ret != 0)

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to unbypass %s: %d\n",

					 "ASoC: Failed to bypass %s: %d\n",

					 w->name, ret);

		}
@@ -3211,15 +3211,11 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, 
	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);

	const char *pin = (const char *)kcontrol->private_value;



	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	if (ucontrol->value.integer.value[0])

		snd_soc_dapm_enable_pin(&card->dapm, pin);

	else

		snd_soc_dapm_disable_pin(&card->dapm, pin);



	mutex_unlock(&card->dapm_mutex);



	snd_soc_dapm_sync(&card->dapm);

	return 0;

}
@@ -3249,7 +3245,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 
			ret = regulator_allow_bypass(w->regulator, true);

			if (ret != 0)

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to unbypass %s: %d\n",

					 "ASoC: Failed to bypass %s: %d\n",

					 w->name, ret);

		}

		break;
@@ -3767,6 +3763,26 @@ void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, 
	mutex_unlock(&card->dapm_mutex);

}



/**

 * snd_soc_dapm_enable_pin_unlocked - enable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Enables input/output pin and its parents or children widgets iff there is

 * a valid audio route and active audio stream.

 *

 * Requires external locking.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				   const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 1);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin_unlocked);



/**

 * snd_soc_dapm_enable_pin - enable pin.

 * @dapm: DAPM context
@@ -3774,17 +3790,26 @@ void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, 
 *

 * Enables input/output pin and its parents or children widgets iff there is

 * a valid audio route and active audio stream.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 1);

	int ret;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	ret = snd_soc_dapm_set_pin(dapm, pin, 1);



	mutex_unlock(&dapm->card->dapm_mutex);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin);



/**

 * snd_soc_dapm_force_enable_pin - force a pin to be enabled

 * snd_soc_dapm_force_enable_pin_unlocked - force a pin to be enabled

 * @dapm: DAPM context

 * @pin: pin name

 *
@@ -3792,10 +3817,12 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin); 
 * intended for use with microphone bias supplies used in microphone

 * jack detection.

 *

 * Requires external locking.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

					 const char *pin)

{

	struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
@@ -3812,24 +3839,102 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, 


	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin_unlocked);



/**

 * snd_soc_dapm_force_enable_pin - force a pin to be enabled

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Enables input/output pin regardless of any other state.  This is

 * intended for use with microphone bias supplies used in microphone

 * jack detection.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin)

{

	int ret;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	ret = snd_soc_dapm_force_enable_pin_unlocked(dapm, pin);



	mutex_unlock(&dapm->card->dapm_mutex);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);



/**

 * snd_soc_dapm_disable_pin_unlocked - disable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Disables input/output pin and its parents or children widgets.

 *

 * Requires external locking.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm,

				    const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 0);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin_unlocked);



/**

 * snd_soc_dapm_disable_pin - disable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Disables input/output pin and its parents or children widgets.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,

			     const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 0);

	int ret;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	ret = snd_soc_dapm_set_pin(dapm, pin, 0);



	mutex_unlock(&dapm->card->dapm_mutex);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin);



/**

 * snd_soc_dapm_nc_pin_unlocked - permanently disable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 *

 * Requires external locking.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm,

			       const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 0);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin_unlocked);



/**

 * snd_soc_dapm_nc_pin - permanently disable pin.

 * @dapm: DAPM context
@@ -3846,7 +3951,15 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin); 
 */

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 0);

	int ret;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	ret = snd_soc_dapm_set_pin(dapm, pin, 0);



	mutex_unlock(&dapm->card->dapm_mutex);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin);