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

Commit bcc4dc0c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9335: ensure MCLK is enabled before efuse sensing"

parents ef5057af c7b9b5ed

drivers/soundwire/swr-wcd-ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -1372,7 +1372,9 @@ static int swrm_device_down(struct device *dev) 
					__func__, swr_dev->dev_num);

		}

		dev_dbg(dev, "%s: Shutting down SWRM\n", __func__);

		pm_runtime_disable(dev);

		pm_runtime_set_suspended(dev);

		pm_runtime_enable(dev);

		swrm_clk_request(swrm, false);

	}

	mutex_unlock(&swrm->reslock);

sound/soc/codecs/wcd9335.c

+2 −2
Original line number Diff line number Diff line
@@ -11410,6 +11410,8 @@ static int tasha_post_reset_cb(struct wcd9xxx *wcd9xxx) 
				    0x03, 0x01);

	tasha_codec_init_reg(codec);



	wcd_resmgr_post_ssr_v2(tasha->resmgr);



	tasha_enable_efuse_sensing(codec);



	regcache_mark_dirty(codec->component.regmap);
@@ -11420,8 +11422,6 @@ static int tasha_post_reset_cb(struct wcd9xxx *wcd9xxx) 
	if (IS_ERR_VALUE(ret))

		dev_err(codec->dev, "%s: invalid pdata\n", __func__);



	wcd_resmgr_post_ssr_v2(tasha->resmgr);



	/* MBHC Init */

	wcd_mbhc_deinit(&tasha->mbhc);

	tasha->mbhc_started = false;

sound/soc/codecs/wsa881x.c

+1 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ static int wsa881x_swr_down(struct swr_device *pdev) 
		dev_err(&pdev->dev, "%s: wsa881x is NULL\n", __func__);

		return -EINVAL;

	}

	cancel_delayed_work_sync(&wsa881x->ocp_ctl_work);

	ret = wsa881x_gpio_ctrl(wsa881x, false);

	if (ret)

		dev_err(&pdev->dev, "%s: Failed to disable gpio\n", __func__);