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

Commit 96d83ec1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ffe853a8 on remote branch 

Change-Id: Ifde3e9fa15c2ef69ad1b205e9f16c3763fe10cd1
parents 3e46dab1 ffe853a8

Makefile.am

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ endif 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qrb5165 sxr2130))

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd938x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sxr2130))

obj-m += asoc/codecs/wsa883x/

endif

asoc/codecs/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -167,8 +167,10 @@ ifdef CONFIG_SND_SOC_WSA881X_ANALOG 
	WSA881X_ANALOG_OBJS += wsa881x-analog.o

	WSA881X_ANALOG_OBJS += wsa881x-tables-analog.o

	WSA881X_ANALOG_OBJS += wsa881x-regmap-analog.o

ifdef CONFIG_SND_SOC_BENGAL

	WSA881X_ANALOG_OBJS += wsa881x-temp-sensor.o

endif

endif

ifdef CONFIG_SND_SOC_MSM_STUB

	STUB_OBJS += msm_stub.o

endif

asoc/codecs/audio-ext-clk-up.c

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

/*

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

 * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/kernel.h>
@@ -33,6 +33,7 @@ enum { 
	AUDIO_EXT_CLK_LPASS8,

	AUDIO_EXT_CLK_LPASS_AUDIO_HW_VOTE,

	AUDIO_EXT_CLK_PM660_PMI,

	AUDIO_EXT_CLK_DIV_CLK2,

	AUDIO_EXT_CLK_LPASS_MAX,

	AUDIO_EXT_CLK_EXTERNAL_PLL = AUDIO_EXT_CLK_LPASS_MAX,

	AUDIO_EXT_CLK_MAX,
@@ -110,7 +111,7 @@ static void audio_ext_clk_unprepare(struct clk_hw *hw) 
		ret = pinctrl_select_state(pnctrl_info->pinctrl,

					   pnctrl_info->sleep);

		if (ret) {

			pr_err("%s: active state select failed with %d\n",

			pr_err("%s: sleep state select failed with %d\n",

				__func__, ret);

			return;

		}
@@ -405,6 +406,19 @@ static struct audio_ext_clk audio_clk_array[] = { 
			},

		},

	},

	{

		.pnctrl_info = {NULL},

		.fact = {

			.mult = 1,

			.div = 1,

			.hw.init = &(struct clk_init_data){

				.name = "audio_ext_div_clk2",

				.parent_names = (const char *[]){ "div_clk2" },

				.num_parents = 1,

				.ops = &audio_ext_clk_ops,

			},

		},

	},

};



static int audio_get_pinctrl(struct platform_device *pdev)

asoc/codecs/msm_hdmi_codec_rx.c

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

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

/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */

#include <linux/platform_device.h>

#include <linux/slab.h>
@@ -222,9 +222,9 @@ static int msm_ext_disp_audio_type_get(struct snd_kcontrol *kcontrol, 
	rc = msm_ext_disp_select_audio_codec(codec_data->ext_disp_core_pdev,

						 &codec_info);



	if (!codec_data->ext_disp_ops.get_audio_edid_blk ||

	if (!codec_data->ext_disp_ops.cable_status ||

	    !codec_data->ext_disp_ops.get_intf_id || rc) {

		dev_err(component->dev, "%s: get_audio_edid_blk() or get_intf_id is NULL\n",

		dev_err(component->dev, "%s: cable_status() or get_intf_id is NULL\n",

			__func__);

		rc = -EINVAL;

		goto cable_err;

asoc/codecs/msm_sdw/msm_sdw_cdc.c

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

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

/* Copyright (c) 2016-2018, 2020-2021, 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
@@ -328,8 +328,7 @@ static int msm_sdw_ahb_write_device(struct msm_sdw_priv *msm_sdw, 
{

	u32 temp = (u32)(*value) & 0x000000FF;



	if (!msm_sdw->dev_up ||

	    !q6core_is_adsp_ready()) {

	if (!msm_sdw->dev_up) {

		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",

				    __func__);

		return 0;
@@ -344,8 +343,7 @@ static int msm_sdw_ahb_read_device(struct msm_sdw_priv *msm_sdw, 
{

	u32 temp;



	if (!msm_sdw->dev_up ||

	    !q6core_is_adsp_ready()) {

	if (!msm_sdw->dev_up) {

		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",

				    __func__);

		return 0;
@@ -2006,7 +2004,8 @@ static int msm_sdw_probe(struct platform_device *pdev) 
	int adsp_state;



	adsp_state = apr_get_subsys_state();

	if (adsp_state != APR_SUBSYS_LOADED) {

	if (adsp_state != APR_SUBSYS_LOADED ||

		!q6core_is_adsp_ready()) {

		dev_err(&pdev->dev, "Adsp is not loaded yet %d\n",

				adsp_state);

		return -EPROBE_DEFER;