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

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

Merge "asoc: bolero: Call swr device down before setting ssr down"

parents e7d09053 5ee54aee

asoc/codecs/bolero/rx-macro.c

+2 −2
Original line number Diff line number Diff line
@@ -1237,10 +1237,10 @@ static int rx_macro_event_handler(struct snd_soc_component *component, 
		rx_priv->dev_up = false;

		swrm_wcd_notify(

			rx_priv->swr_ctrl_data[0].rx_swr_pdev,

			SWR_DEVICE_SSR_DOWN, NULL);

			SWR_DEVICE_DOWN, NULL);

		swrm_wcd_notify(

			rx_priv->swr_ctrl_data[0].rx_swr_pdev,

			SWR_DEVICE_DOWN, NULL);

			SWR_DEVICE_SSR_DOWN, NULL);

		break;

	case BOLERO_MACRO_EVT_SSR_UP:

		rx_priv->dev_up = true;

asoc/codecs/bolero/tx-macro.c

+2 −2
Original line number Diff line number Diff line
@@ -312,10 +312,10 @@ static int tx_macro_event_handler(struct snd_soc_component *component, 
	case BOLERO_MACRO_EVT_SSR_DOWN:

		swrm_wcd_notify(

			tx_priv->swr_ctrl_data[0].tx_swr_pdev,

			SWR_DEVICE_SSR_DOWN, NULL);

			SWR_DEVICE_DOWN, NULL);

		swrm_wcd_notify(

			tx_priv->swr_ctrl_data[0].tx_swr_pdev,

			SWR_DEVICE_DOWN, NULL);

			SWR_DEVICE_SSR_DOWN, NULL);

		break;

	case BOLERO_MACRO_EVT_SSR_UP:

		/* reset swr after ssr/pdr */

asoc/codecs/bolero/wsa-macro.c

+2 −2
Original line number Diff line number Diff line
@@ -924,10 +924,10 @@ static int wsa_macro_event_handler(struct snd_soc_component *component, 
	case BOLERO_MACRO_EVT_SSR_DOWN:

		swrm_wcd_notify(

			wsa_priv->swr_ctrl_data[0].wsa_swr_pdev,

			SWR_DEVICE_SSR_DOWN, NULL);

			SWR_DEVICE_DOWN, NULL);

		swrm_wcd_notify(

			wsa_priv->swr_ctrl_data[0].wsa_swr_pdev,

			SWR_DEVICE_DOWN, NULL);

			SWR_DEVICE_SSR_DOWN, NULL);

		break;

	case BOLERO_MACRO_EVT_SSR_UP:

		/* reset swr after ssr/pdr */