Unverified Commit cc4d891f authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcd-mbhc: add runtime pm support 



under low power state a SoundWire Wake IRQ could trigger MBHC interrupts
so make sure that codec is not in suspended state when this happens.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220224111718.6264-17-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 584a6301

sound/soc/codecs/wcd-mbhc-v2.c

+26 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/init.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/pm_runtime.h>

#include <linux/printk.h>

#include <linux/delay.h>

#include <linux/kernel.h>
@@ -711,6 +712,16 @@ static irqreturn_t wcd_mbhc_hphr_ocp_irq(int irq, void *data) 
static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)

{

	struct snd_soc_component *component = mbhc->component;

	int ret;



	ret = pm_runtime_get_sync(component->dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(component->dev,

				    "pm_runtime_get_sync failed in %s, ret %d\n",

				    __func__, ret);

		pm_runtime_put_noidle(component->dev);

		return ret;

	}



	mutex_lock(&mbhc->lock);
@@ -751,6 +762,9 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc) 


	mutex_unlock(&mbhc->lock);



	pm_runtime_mark_last_busy(component->dev);

	pm_runtime_put_autosuspend(component->dev);



	return 0;

}
@@ -1078,10 +1092,19 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
	int output_mv, cross_conn, hs_threshold, try = 0, micbias_mv;

	bool is_spl_hs = false;

	bool is_pa_on;

	int ret;



	mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch);

	component = mbhc->component;



	ret = pm_runtime_get_sync(component->dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(component->dev,

				    "pm_runtime_get_sync failed in %s, ret %d\n",

				    __func__, ret);

		pm_runtime_put_noidle(component->dev);

		return;

	}

	micbias_mv = wcd_mbhc_get_micbias(mbhc);

	hs_threshold = wcd_mbhc_adc_get_hs_thres(mbhc);
@@ -1232,6 +1255,9 @@ static void wcd_correct_swch_plug(struct work_struct *work) 


	if (mbhc->mbhc_cb->hph_pull_down_ctrl)

		mbhc->mbhc_cb->hph_pull_down_ctrl(component, true);



	pm_runtime_mark_last_busy(component->dev);

	pm_runtime_put_autosuspend(component->dev);

}



static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data)