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

Commit 2461a845 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: Do not disable mclk in widget power down upon enable failure"

parents b28d908e 453162d8

asoc/codecs/bolero/rx-macro.c

+8 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -351,6 +351,7 @@ struct rx_macro_priv { 
	u16 prim_int_users[INTERP_MAX];

	int rx_mclk_users;

	int swr_clk_users;

	bool dapm_mclk_enable;

	bool reset_swr;

	int clsh_users;

	int rx_mclk_cnt;
@@ -1129,8 +1130,13 @@ static int rx_macro_mclk_event(struct snd_soc_dapm_widget *w, 
			rx_priv->swr_ctrl_data[0].rx_swr_pdev,

			SWR_CLK_FREQ, &mclk_freq);

		ret = rx_macro_mclk_enable(rx_priv, 1, true);

		if (ret)

			rx_priv->dapm_mclk_enable = false;

		else

			rx_priv->dapm_mclk_enable = true;

		break;

	case SND_SOC_DAPM_POST_PMD:

		if (rx_priv->dapm_mclk_enable)

			ret = rx_macro_mclk_enable(rx_priv, 0, true);

		break;

	default:

asoc/codecs/bolero/tx-macro.c

+8 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -134,6 +134,7 @@ struct tx_macro_priv { 
	bool dec_active[NUM_DECIMATORS];

	int tx_mclk_users;

	int swr_clk_users;

	bool dapm_mclk_enable;

	bool reset_swr;

	struct clk *tx_core_clk;

	struct clk *tx_npl_clk;
@@ -266,8 +267,13 @@ static int tx_macro_mclk_event(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		ret = tx_macro_mclk_enable(tx_priv, 1);

		if (ret)

			tx_priv->dapm_mclk_enable = false;

		else

			tx_priv->dapm_mclk_enable = true;

		break;

	case SND_SOC_DAPM_POST_PMD:

		if (tx_priv->dapm_mclk_enable)

			ret = tx_macro_mclk_enable(tx_priv, 0);

		break;

	default:

asoc/codecs/bolero/wsa-macro.c

+8 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -196,6 +196,7 @@ struct wsa_macro_priv { 
	u16 prim_int_users[WSA_MACRO_RX1 + 1];

	u16 wsa_mclk_users;

	u16 swr_clk_users;

	bool dapm_mclk_enable;

	bool reset_swr;

	unsigned int vi_feed_value;

	struct mutex mclk_lock;
@@ -830,8 +831,13 @@ static int wsa_macro_mclk_event(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		ret = wsa_macro_mclk_enable(wsa_priv, 1, true);

		if (ret)

			wsa_priv->dapm_mclk_enable = false;

		else

			wsa_priv->dapm_mclk_enable = true;

		break;

	case SND_SOC_DAPM_POST_PMD:

		if (wsa_priv->dapm_mclk_enable)

			wsa_macro_mclk_enable(wsa_priv, 0, true);

		break;

	default: