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

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

Merge "audio-kernel: Rename hw vote rsc to digital cdc rsc mgr"

parents da1618af 5eb85455

4.0/asoc/codecs/bolero/bolero-cdc.c

+7 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <soc/snd_event.h>

#include <linux/pm_runtime.h>

#include <soc/swr-common.h>

#include <dsp/hw-vote-rsc.h>

#include <dsp/digital-cdc-rsc-mgr.h>

#include "bolero-cdc.h"

#include "internal.h"

#include "bolero-clk-rsc.h"
@@ -836,10 +836,6 @@ static int bolero_ssr_enable(struct device *dev, void *data) 
	if (priv->rsc_clk_cb)

		priv->rsc_clk_cb(priv->clk_dev, BOLERO_MACRO_EVT_SSR_GFMUX_UP);



	/* Reset HW votes after SSR */

	hw_vote_rsc_reset(priv->lpass_core_hw_vote);

	hw_vote_rsc_reset(priv->lpass_audio_hw_vote);



	trace_printk("%s: clk count reset\n", __func__);

	regcache_cache_only(priv->regmap, false);

	mutex_lock(&priv->clk_lock);
@@ -1384,7 +1380,7 @@ int bolero_runtime_resume(struct device *dev) 
	}



	if (priv->core_hw_vote_count == 0) {

		ret = hw_vote_rsc_enable(priv->lpass_core_hw_vote);

		ret = digital_cdc_rsc_mgr_hw_vote_enable(priv->lpass_core_hw_vote);

		if (ret < 0) {

			dev_err(dev, "%s:lpass core hw enable failed\n",

				__func__);
@@ -1402,7 +1398,7 @@ int bolero_runtime_resume(struct device *dev) 
	}



	if (priv->core_audio_vote_count == 0) {

		ret = hw_vote_rsc_enable(priv->lpass_audio_hw_vote);

		ret = digital_cdc_rsc_mgr_hw_vote_enable(priv->lpass_audio_hw_vote);

		if (ret < 0) {

			dev_err(dev, "%s:lpass audio hw enable failed\n",

				__func__);
@@ -1427,7 +1423,8 @@ int bolero_runtime_suspend(struct device *dev) 
	mutex_lock(&priv->vote_lock);

	if (priv->lpass_core_hw_vote != NULL) {

		if (--priv->core_hw_vote_count == 0)

			hw_vote_rsc_disable(priv->lpass_core_hw_vote);

			digital_cdc_rsc_mgr_hw_vote_disable(

					priv->lpass_core_hw_vote);

		if (priv->core_hw_vote_count < 0)

			priv->core_hw_vote_count = 0;

	} else {
@@ -1439,7 +1436,8 @@ int bolero_runtime_suspend(struct device *dev) 


	if (priv->lpass_audio_hw_vote != NULL) {

		if (--priv->core_audio_vote_count == 0)

			hw_vote_rsc_disable(priv->lpass_audio_hw_vote);

			digital_cdc_rsc_mgr_hw_vote_disable(

					priv->lpass_audio_hw_vote);

		if (priv->core_audio_vote_count < 0)

			priv->core_audio_vote_count = 0;

	} else {

4.0/asoc/codecs/bolero/va-macro.c

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asoc/msm-cdc-pinctrl.h>

#include <soc/swr-common.h>

#include <soc/swr-wcd.h>

#include <dsp/digital-cdc-rsc-mgr.h>

#include "bolero-cdc.h"

#include "bolero-cdc-registers.h"

#include "bolero-clk-rsc.h"
@@ -442,7 +443,8 @@ static int va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (va_priv->lpass_audio_hw_vote) {

			ret = clk_prepare_enable(va_priv->lpass_audio_hw_vote);

			ret = digital_cdc_rsc_mgr_hw_vote_enable(

					va_priv->lpass_audio_hw_vote);

			if (ret)

				dev_err(va_dev,

					"%s: lpass audio hw enable failed\n",

4.0/config/atollauto.conf

+1 −0
Original line number Diff line number Diff line
@@ -39,3 +39,4 @@ CONFIG_SND_EVENT=m 
CONFIG_TDM_DISABLE=m

CONFIG_MI2S_DISABLE=m

CONFIG_AUXPCM_DISABLE=m

CONFIG_DIGITAL_CDC_RSC_MGR=m

4.0/config/atollautoconf.h

+1 −0
Original line number Diff line number Diff line
@@ -43,3 +43,4 @@ 
#define CONFIG_TDM_DISABLE 1

#define CONFIG_MI2S_DISABLE 1

#define CONFIG_AUXPCM_DISABLE 1

#define CONFIG_DIGITAL_CDC_RSC_MGR 1

4.0/dsp/Kbuild

+4 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ ifdef CONFIG_SND_SOC_MSM_QDSP6V2_INTF 
	Q6_OBJS += adsp_err.o

	Q6_OBJS += msm_audio_ion.o

	Q6_OBJS += avtimer.o

	Q6_OBJS += hw-vote-rsc.o

	Q6_OBJS += q6_init.o

endif
@@ -132,7 +131,6 @@ ifdef CONFIG_SND_SOC_MSM_QDSP6V2_VM 
	Q6_OBJS += adsp_err.o

	Q6_OBJS += msm_audio_ion_vm.o

	Q6_OBJS += avtimer.o

	Q6_OBJS += hw-vote-rsc.o

	Q6_OBJS += q6_init.o

endif
@@ -176,6 +174,10 @@ ifdef CONFIG_VOICE_MHI 
	Q6_OBJS += voice_mhi.o

endif



ifdef CONFIG_DIGITAL_CDC_RSC_MGR

	Q6_OBJS += digital-cdc-rsc-mgr.o

endif



LINUX_INC +=	-Iinclude/linux



INCS +=		$(COMMON_INC) \