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

Commit 5ee54aee authored by Ramprasad Katkam's avatar Ramprasad Katkam Committed by Gerrit - the friendly Code Review server
Browse files

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



Invoke swr device down callback to set soundwire master
to reset state before setting ssr down flag. This is to
ensure master is reset to proper state after ssr/pdr.

Change-Id: Ifb5548f603ac03b772006314f4723c0ac0176928
Signed-off-by: default avatarRamprasad Katkam <katkam@codeaurora.org>
parent a4c747b6

asoc/codecs/bolero/rx-macro.c

+2 −2
Original line number Diff line number Diff line
@@ -1177,10 +1177,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 */