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

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

Merge "ASoC: msm8x16-wcd: add mclk and pdm ctl register as non cacheable."

parents 2a60bd28 f0e02fc7

sound/soc/codecs/msm8x16-wcd-tables.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -286,6 +286,8 @@ const u8 msm8x16_wcd_reg_readonly[MSM8X16_WCD_CACHE_SIZE] = { 
		[MSM8X16_WCD_A_CDC_TX2_VOL_CTL_CFG] = 1,

		[MSM8X16_WCD_A_CDC_TX2_VOL_CTL_CFG] = 1,

		[MSM8X16_WCD_A_CDC_IIR1_COEF_B1_CTL] = 1,

		[MSM8X16_WCD_A_CDC_IIR1_COEF_B1_CTL] = 1,

		[MSM8X16_WCD_A_CDC_IIR2_COEF_B1_CTL] = 1,

		[MSM8X16_WCD_A_CDC_IIR2_COEF_B1_CTL] = 1,

		[MSM8X16_WCD_A_CDC_CLK_MCLK_CTL] = 1,

		[MSM8X16_WCD_A_CDC_CLK_PDM_CTL] = 1,

};

};

const u8 msm8x16_wcd_reset_reg_defaults[MSM8X16_WCD_CACHE_SIZE] = {

const u8 msm8x16_wcd_reset_reg_defaults[MSM8X16_WCD_CACHE_SIZE] = {

		[MSM8X16_WCD_A_DIGITAL_REVISION1] =

		[MSM8X16_WCD_A_DIGITAL_REVISION1] =

sound/soc/codecs/msm8x16-wcd.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -2837,16 +2837,11 @@ static int modem_state_callback(struct notifier_block *nb, unsigned long value, 
{

{

	bool timedout;

	bool timedout;

	unsigned long timeout;

	unsigned long timeout;

	static bool booted_once;





	if (value == SUBSYS_BEFORE_SHUTDOWN)

	if (value == SUBSYS_BEFORE_SHUTDOWN)

		msm8x16_wcd_device_down(registered_codec);

		msm8x16_wcd_device_down(registered_codec);

	else if (value == SUBSYS_AFTER_POWERUP) {

	else if (value == SUBSYS_AFTER_POWERUP) {





		if (!booted_once) {

			booted_once = true;

			return NOTIFY_OK;

		}

		dev_dbg(registered_codec->dev,

		dev_dbg(registered_codec->dev,

			"ADSP is about to power up. bring up codec\n");

			"ADSP is about to power up. bring up codec\n");