mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 20:33:58 -04:00
Merge "asoc: codec: Fix compilation for wcd934x codec driver"
This commit is contained in:
qctecmdr
Gerrit - the friendly Code Review server
commit
911e4533ee
8 changed files with 31 additions and 27 deletions
1
Makefile
1
Makefile
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 },
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* 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);
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue