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

Commit 7a87ac1f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/dapm' of... 

Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
parents a9576cbb e95d73c4

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

+9 −1
Original line number Diff line number Diff line
@@ -449,20 +449,28 @@ 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_sync_unlocked(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);



/* Mostly internal - should not normally be used */

void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason);

void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);



/* dapm path query */

include/sound/soc.h

+11 −0
Original line number Diff line number Diff line
@@ -1188,4 +1188,15 @@ extern struct dentry *snd_soc_debugfs_root; 


extern const struct dev_pm_ops snd_soc_pm_ops;



/* Helper functions */

static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm)

{

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

}



static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)

{

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

}



#endif

sound/soc/codecs/adav80x.c

+11 −6
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, 
			      unsigned int freq, int dir)

{

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	if (dir == SND_SOC_CLOCK_IN) {

		switch (clk_id) {
@@ -573,7 +574,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, 
			regmap_write(adav80x->regmap, ADAV80X_ICLK_CTRL2,

				iclk_ctrl2);



			snd_soc_dapm_sync(&codec->dapm);

			snd_soc_dapm_sync(dapm);

		}

	} else {

		unsigned int mask;
@@ -600,17 +601,21 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, 
			adav80x->sysclk_pd[clk_id] = false;

		}



		snd_soc_dapm_mutex_lock(dapm);



		if (adav80x->sysclk_pd[0])

			snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");

			snd_soc_dapm_disable_pin_unlocked(dapm, "PLL1");

		else

			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");

			snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL1");



		if (adav80x->sysclk_pd[1] || adav80x->sysclk_pd[2])

			snd_soc_dapm_disable_pin(&codec->dapm, "PLL2");

			snd_soc_dapm_disable_pin_unlocked(dapm, "PLL2");

		else

			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2");

			snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL2");



		snd_soc_dapm_sync(&codec->dapm);

		snd_soc_dapm_sync_unlocked(dapm);



		snd_soc_dapm_mutex_unlock(dapm);

	}



	return 0;