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

Commit bc905e33 authored by Amit Kumar H's avatar Amit Kumar H Committed by Asish Bhattacharya
Browse files

asoc: codec: Fix compilation for wcd9335 driver 



Change macros for 5.4 kernel compatible.

Change-Id: Iaf15183653d8c2f2072437cfb92d048a954e96f9
Signed-off-by: default avatarVivek Malapaka <malapaka@codeaurora.org>
Signed-off-by: default avatarAmit Kumar H <amih@codeaurora.org>
parent 19df8856

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/wcd9xxx-core.c

+4 −1
Original line number Diff line number Diff line
@@ -63,13 +63,16 @@ static struct regmap_config wcd9xxx_base_regmap_config = { 
	.reg_bits = 16,

	.val_bits = 8,

	.can_multi_write = true,

	.use_single_read = true,

	.use_single_write = true,

};



static struct regmap_config wcd9xxx_i2c_base_regmap_config = {

	.reg_bits = 16,

	.val_bits = 8,

	.can_multi_write = false,

	.use_single_rw = true,

	.use_single_read = true,

	.use_single_write = true,

};



static u8 wcd9xxx_pgd_la;