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

Commit 16b3e1dc authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dbd78e4a on remote branch 

Change-Id: Ia31a6507f71b57967fce48a94c3ef2ade51a8ff0
parents 9d852532 dbd78e4a

Makefile.am

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd937x/

endif



ifeq ($(TARGET_SUPPORT), qrb5165)

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd938x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm))

obj-m := ipc/

obj-m += dsp/
@@ -49,6 +54,9 @@ endif 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qrb5165))

KBUILD_OPTIONS += CONFIG_SND_SOC_KONA=m

endif

endif



all:

asoc/codecs/bolero/bolero-cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ int bolero_register_macro(struct device *dev, u16 macro_id, 
	priv->num_macros_registered++;

	priv->macros_supported[macro_id] = true;



	dev_dbg(dev, "%s: register macro successful:%d\n", macro_id);

	dev_dbg(dev, "%s: register macro successful:%d\n", __func__, macro_id);



	if (priv->num_macros_registered == priv->num_macros) {

		ret = bolero_copy_dais_from_macro(priv);

asoc/codecs/bolero/bolero-clk-rsc.c

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int bolero_rsc_clk_reset(struct device *dev, int clk_id) 
	int count = 0;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return -EINVAL;

	}
@@ -147,7 +147,7 @@ void bolero_clk_rsc_enable_all_clocks(struct device *dev, bool enable) 
	int i = 0;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return;

	}
@@ -439,7 +439,7 @@ void bolero_clk_rsc_fs_gen_request(struct device *dev, bool enable) 
	struct bolero_clk_rsc *priv = NULL;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return;

	}

	clk_dev = bolero_get_rsc_clk_device_ptr(dev->parent);
@@ -514,7 +514,7 @@ int bolero_clk_rsc_request_clock(struct device *dev, 
	bool mux_switch = false;



	if (!dev) {

		pr_err("%s: dev is null %d\n", __func__);

		pr_err("%s: dev is null\n", __func__);

		return -EINVAL;

	}

	if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) &&

asoc/codecs/bolero/rx-macro.c

+2 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

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

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

 */



#include <linux/module.h>
@@ -1120,7 +1120,7 @@ static int rx_macro_get_channel_map(struct snd_soc_dai *dai, 
		*rx_slot = ch_mask;

		*rx_num = rx_priv->active_ch_cnt[dai->id];

		dev_dbg(rx_priv->dev,

			"%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%x\n",

			"%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%lx\n",

			__func__, dai->id, *rx_slot, *rx_num, rx_priv->active_ch_mask[dai->id]);

		break;

	case RX_MACRO_AIF_ECHO:
@@ -1374,9 +1374,6 @@ static int rx_macro_event_handler(struct snd_soc_component *component, 
		trace_printk("%s, enter SSR down\n", __func__);

		rx_priv->dev_up = false;

		if (rx_priv->swr_ctrl_data) {

			swrm_wcd_notify(

				rx_priv->swr_ctrl_data[0].rx_swr_pdev,

				SWR_DEVICE_DOWN, NULL);

			swrm_wcd_notify(

				rx_priv->swr_ctrl_data[0].rx_swr_pdev,

				SWR_DEVICE_SSR_DOWN, NULL);

asoc/codecs/bolero/tx-macro.c

+0 −3
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ static int tx_macro_event_handler(struct snd_soc_component *component, 
	case BOLERO_MACRO_EVT_SSR_DOWN:

		trace_printk("%s, enter SSR down\n", __func__);

		if (tx_priv->swr_ctrl_data) {

			swrm_wcd_notify(

				tx_priv->swr_ctrl_data[0].tx_swr_pdev,

				SWR_DEVICE_DOWN, NULL);

			swrm_wcd_notify(

				tx_priv->swr_ctrl_data[0].tx_swr_pdev,

				SWR_DEVICE_SSR_DOWN, NULL);