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

Commit 96957b41 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: bolero: Update init registers for tx and rx paths"

parents 59139d32 72fef48d

asoc/codecs/bolero/rx-macro.c

+15 −12
Original line number Diff line number Diff line
@@ -3566,6 +3566,15 @@ static int rx_swrm_clock(void *handle, bool enable) 
	return ret;

}



static const struct rx_macro_reg_mask_val rx_macro_reg_init[] = {

	{BOLERO_CDC_RX_RX0_RX_PATH_SEC7, 0x07, 0x02},

	{BOLERO_CDC_RX_RX1_RX_PATH_SEC7, 0x07, 0x02},

	{BOLERO_CDC_RX_RX2_RX_PATH_SEC7, 0x07, 0x02},

	{BOLERO_CDC_RX_RX0_RX_PATH_CFG3, 0x03, 0x02},

	{BOLERO_CDC_RX_RX1_RX_PATH_CFG3, 0x03, 0x02},

	{BOLERO_CDC_RX_RX2_RX_PATH_CFG3, 0x03, 0x02},

};



static void rx_macro_init_bcl_pmic_reg(struct snd_soc_component *component)

{

	struct device *rx_dev = NULL;
@@ -3620,6 +3629,7 @@ static int rx_macro_init(struct snd_soc_component *component) 
	int ret = 0;

	struct device *rx_dev = NULL;

	struct rx_macro_priv *rx_priv = NULL;

	int i;



	rx_dev = bolero_get_device_ptr(component->dev, RX_MACRO);

	if (!rx_dev) {
@@ -3671,18 +3681,11 @@ static int rx_macro_init(struct snd_soc_component *component) 
	snd_soc_dapm_ignore_suspend(dapm, "RX_TX DEC3_INP");

	snd_soc_dapm_sync(dapm);



	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX0_RX_PATH_SEC7,

				0x07, 0x02);

	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX1_RX_PATH_SEC7,

				0x07, 0x02);

	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX2_RX_PATH_SEC7,

				0x07, 0x02);

	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX0_RX_PATH_CFG3,

				0x03, 0x02);

	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX1_RX_PATH_CFG3,

				0x03, 0x02);

	snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX2_RX_PATH_CFG3,

				0x03, 0x02);

	for (i = 0; i < ARRAY_SIZE(rx_macro_reg_init); i++)

		snd_soc_component_update_bits(component,

				rx_macro_reg_init[i].reg,

				rx_macro_reg_init[i].mask,

				rx_macro_reg_init[i].val);



	rx_priv->component = component;

	rx_macro_init_bcl_pmic_reg(component);

asoc/codecs/bolero/tx-macro.c

+16 −2
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ enum { 
	VA_MCLK,

};



struct tx_macro_reg_mask_val {

	u16 reg;

	u8 mask;

	u8 val;

};



struct tx_mute_work {

	struct tx_macro_priv *tx_priv;

	u32 decimator;
@@ -2089,6 +2095,10 @@ static int tx_macro_validate_dmic_sample_rate(u32 dmic_sample_rate, 
	return dmic_sample_rate;

}



static const struct tx_macro_reg_mask_val tx_macro_reg_init[] = {

	{BOLERO_CDC_TX0_TX_PATH_SEC7, 0x3F, 0x0E},

};



static int tx_macro_init(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm =
@@ -2168,8 +2178,12 @@ static int tx_macro_init(struct snd_soc_component *component) 
	}

	tx_priv->component = component;



	for (i = 0; i < ARRAY_SIZE(tx_macro_reg_init); i++)

		snd_soc_component_update_bits(component,

		BOLERO_CDC_TX0_TX_PATH_SEC7, 0x3F, 0x0E);

				tx_macro_reg_init[i].reg,

				tx_macro_reg_init[i].mask,

				tx_macro_reg_init[i].val);



	return 0;

}