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

Commit 52c6f224 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5cfdc379 on remote branch 

Change-Id: I9a8d75ee2ae11d186e8a3e5510d638b4063784c1
parents aca15b39 5cfdc379

asoc/codecs/wcd937x/wcd937x.c

+8 −1
Original line number Diff line number Diff line
@@ -143,9 +143,16 @@ static int wcd937x_init_reg(struct snd_soc_component *component) 
				0xFF, 0xFA);

	/* Set VBG Voltage to P0.5V for Tanggu second source */

	if (snd_soc_component_read32(component, WCD937X_DIGITAL_EFUSE_REG_16)

	    == 0x01)

	    == 0x01) {

		snd_soc_component_update_bits(component,

				WCD937X_BIAS_VBG_FINE_ADJ, 0xF0, 0xB0);

	} else if (snd_soc_component_read32(component,

		WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) {

		snd_soc_component_update_bits(component,

				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L, 0x1F, 0x04);

		snd_soc_component_update_bits(component,

				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_R, 0x1F, 0x04);

	}

	return 0;

}

dsp/q6afe.c

+6 −0
Original line number Diff line number Diff line
@@ -416,6 +416,12 @@ static int q6afe_load_avcs_modules(int num_modules, u16 port_id, 
					goto load_unload;

				}



				if (format_id == ASM_MEDIA_FMT_APTX_ADAPTIVE) {

					pm[i]->payload->load_unload_info[0].id1 =

						AVS_MODULE_ID_DEPACKETIZER_COP;

					goto load_unload;

				}



				pm[i]->payload->load_unload_info[1].module_type =

						AMDB_MODULE_TYPE_DECODER;

				pm[i]->payload->load_unload_info[1].id1 =