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

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

Merge "asoc: codecs: bolero: leave frame sync to default value"

parents da740e4b 27970845

asoc/codecs/bolero/tx-macro.c

+0 −3
Original line number Diff line number Diff line
@@ -1456,9 +1456,6 @@ static int tx_macro_swrm_clock(void *handle, bool enable) 
					BOLERO_CDC_TX_CLK_RST_CTRL_SWR_CONTROL,

					0x02, 0x00);

			tx_priv->reset_swr = false;

			regmap_update_bits(regmap,

				BOLERO_CDC_TX_CLK_RST_CTRL_SWR_CONTROL,

				0x1C, 0x0C);

			msm_cdc_pinctrl_select_active_state(

						tx_priv->tx_swr_gpio_p);

		}

asoc/codecs/bolero/wsa-macro.c

+0 −3
Original line number Diff line number Diff line
@@ -2589,9 +2589,6 @@ static int wsa_swrm_clock(void *handle, bool enable) 
					BOLERO_CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,

					0x02, 0x00);

			wsa_priv->reset_swr = false;

			regmap_update_bits(regmap,

				BOLERO_CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,

				0x1C, 0x0C);

			msm_cdc_pinctrl_select_active_state(

						wsa_priv->wsa_swr_gpio_p);

		}