A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

asoc: codec: Fix compilation for wcd9335 driver

Browse source 
Change macros for 5.4 kernel compatible.

Change-Id: Iaf15183653d8c2f2072437cfb92d048a954e96f9
Signed-off-by: Vivek Malapaka <malapaka@codeaurora.org>
Signed-off-by: Amit Kumar H <amih@codeaurora.org>
This commit is contained in:
Amit Kumar H 2020-09-28 10:01:37 +05:30 • committed by Asish Bhattacharya
commit bc905e33d5
6 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -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)

2
asoc/codecs/Kbuild
View file

@ -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

4
asoc/codecs/wcd9335-regmap.c
View file

@ -1,13 +1,13 @@
// 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 },

18
asoc/codecs/wcd9335.c
View file

@ -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",

5
asoc/codecs/wcd9xxx-core.c
View file

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

2
include/asoc/wcd9xxx-resmgr-v2.h
View file

@ -5,7 +5,7 @@
#ifndef __WCD9XXX_COMMON_V2_H__
#define __WCD9XXX_COMMON_V2_H__
#include <audio/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
#include "core.h"
enum wcd_clock_type {