Merge "asoc: codec: Fix compilation for wcd934x codec driver" (911e4533) · Commits · e / devices / android_kernel_fairphone_FP5

Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ USERINCLUDE += \
		LINUXINCLUDE += \
		-I$(srctree)/techpack/audio/include/uapi \
		-I$(srctree)/techpack/audio/include/uapi/audio \
		-I$(srctree)/techpack/audio/include/asoc \
		-I$(srctree)/techpack/audio/include

		ifeq ($(CONFIG_QTI_QUIN_GVM), y)

asoc/codecs/Kbuild

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,8 +240,8 @@ ifeq ($(call cc-option-yn, -Wheader-guard),y)
		EXTRA_CFLAGS += -Wheader-guard
		endif


		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
		endif

asoc/codecs/wcd9335-regmap.c

+2 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2018, 2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/regmap.h>
		#include <linux/device.h>
		#include <asoc/core.h>
		#include <asoc/wcd9xxx-regmap.h>
		#include <asoc/wcd9335_registers.h>
		#include <wcd9335_registers.h>

		static const struct reg_sequence wcd9335_1_x_defaults[] = {
		{ WCD9335_CODEC_RPM_CLK_GATE, 0x03, 0x00 },

asoc/codecs/wcd9335.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -11123,33 +11123,33 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_PRE_PMD),

		SND_SOC_DAPM_INPUT("AMIC1"),
		SND_SOC_DAPM_MICBIAS_E("MIC BIAS1", SND_SOC_NOPM, 0, 0,
		SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, 0, 0,
		tasha_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,
		tasha_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,
		tasha_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,
		tasha_codec_enable_micbias,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_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,
		tasha_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,
		tasha_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,
		tasha_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,
		tasha_codec_force_enable_micbias,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_SUPPLY(DAPM_LDO_H_STANDALONE, SND_SOC_NOPM, 0, 0,
		@@ -12606,7 +12606,7 @@ int tasha_codec_info_create_codec_entry(struct snd_info_entry *codec_root,

		tasha = snd_soc_component_get_drvdata(component);
		card = component->card;
		tasha->entry = snd_info_create_subdir(codec_root->module,
		tasha->entry = snd_info_create_module_entry(codec_root->module,
		"tasha", codec_root);
		if (!tasha->entry) {
		dev_dbg(component->dev, "%s: failed to create wcd9335 entry\n",

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;
		}