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

Commit 5d7c21de authored by Amitkumar H(Temp)'s avatar Amitkumar H(Temp) Committed by Gerrit - the friendly Code Review server
Browse files

asoc: codec: Fix compilation for wcd934x codec driver 



Fixed compilation issues.

Change-Id: Ia8ba3840f7630361c430ccbaab6cde5a24f8c367
Signed-off-by: default avatarAmit Kumar Hayyal <amih@codeaurora.org>
Signed-off-by: default avatarVivek Malapaka <malapaka@codeaurora.org>
parent bc905e33

asoc/codecs/wcd934x/wcd934x.c

+10 −10
Original line number Diff line number Diff line
@@ -8116,16 +8116,16 @@ static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = { 
	SND_SOC_DAPM_INPUT("AMIC4"),

	SND_SOC_DAPM_INPUT("AMIC5"),



	SND_SOC_DAPM_MICBIAS_E("MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, 0, 0,

		tavil_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS2", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS2", SND_SOC_NOPM, 0, 0,

		tavil_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS3", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS3", SND_SOC_NOPM, 0, 0,

		tavil_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS4", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS4", SND_SOC_NOPM, 0, 0,

		tavil_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -8137,16 +8137,16 @@ static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = { 
		0, 0, tavil_codec_reset_hph_registers,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_MICBIAS_E(DAPM_MICBIAS1_STANDALONE, SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY(DAPM_MICBIAS1_STANDALONE, SND_SOC_NOPM, 0, 0,

		tavil_codec_force_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E(DAPM_MICBIAS2_STANDALONE, SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY(DAPM_MICBIAS2_STANDALONE, SND_SOC_NOPM, 0, 0,

		tavil_codec_force_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E(DAPM_MICBIAS3_STANDALONE, SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY(DAPM_MICBIAS3_STANDALONE, SND_SOC_NOPM, 0, 0,

		tavil_codec_force_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E(DAPM_MICBIAS4_STANDALONE, SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY(DAPM_MICBIAS4_STANDALONE, SND_SOC_NOPM, 0, 0,

		tavil_codec_force_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -9485,7 +9485,7 @@ int tavil_codec_info_create_codec_entry(struct snd_info_entry *codec_root, 


	tavil = snd_soc_component_get_drvdata(component);

	card = component->card;

	tavil->entry = snd_info_create_subdir(codec_root->module,

	tavil->entry = snd_info_create_module_entry(codec_root->module,

					      "tavil", codec_root);

	if (!tavil->entry) {

		dev_dbg(component->dev, "%s: failed to create wcd934x entry\n",
@@ -10356,7 +10356,7 @@ static int tavil_post_reset_cb(struct wcd9xxx *wcd9xxx) 


	component = (struct snd_soc_component *)(wcd9xxx->ssr_priv);

	if (!component->card) {

		dev_err(codec->dev, "%s: sound card is not enumerated.\n",

		dev_err(component->dev, "%s: sound card is not enumerated.\n",

			__func__);

		return -EINVAL;

	}

asoc/codecs/wcd9xxx-utils.h

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

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

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

 */



#ifndef __WCD9XXX_UTILS_H__
@@ -8,8 +8,8 @@ 
#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/regmap.h>

#include "pdata.h"

#include "core.h"

#include <asoc/pdata.h>

#include <asoc/core.h>



struct wcd9xxx_pdata *wcd9xxx_populate_dt_data(struct device *dev);

int wcd9xxx_bringup(struct device *dev);