Commit c0ed3c2e authored by Shenghao Ding's avatar Shenghao Ding Committed by Takashi Iwai
Browse files

ALSA: hda/tas2781: Add name prefix tas2781 for tas2781's dvc_tlv and amp_vol_tlv 



With some new devices adding into the driver, dvc_tlv and amp_vol_tlv will
cause confusion for customers on which devices they support.

Fixes: 5be27f1e ("ALSA: hda/tas2781: Add tas2781 HDA driver")
Signed-off-by: default avatarShenghao Ding <shenghao-ding@ti.com>

Link: https://patch.msgid.link/20250816042741.1659-1-shenghao-ding@ti.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eafae0fd

include/sound/tas2781-tlv.h

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
//

// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier

//

// Copyright (C) 2022 - 2024 Texas Instruments Incorporated

// Copyright (C) 2022 - 2025 Texas Instruments Incorporated

// https://www.ti.com

//

// The TAS2781 driver implements a flexible and configurable
@@ -15,7 +15,7 @@ 
#ifndef __TAS2781_TLV_H__

#define __TAS2781_TLV_H__



static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_dvc_tlv, -10000, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_amp_tlv, 1100, 50, 0);



#endif

sound/hda/codecs/side-codecs/tas2781_hda_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static const struct snd_kcontrol_new tas2770_snd_controls[] = { 
static const struct snd_kcontrol_new tas2781_snd_controls[] = {

	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,

		1, 0, 20, 0, tas2781_amp_getvol,

		tas2781_amp_putvol, amp_vol_tlv),

		tas2781_amp_putvol, tas2781_amp_tlv),

	ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,

		tas2781_force_fwload_get, tas2781_force_fwload_put),

};

sound/hda/codecs/side-codecs/tas2781_hda_spi.c

+4 −2
Original line number Diff line number Diff line
@@ -494,9 +494,11 @@ static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol, 


static struct snd_kcontrol_new tas2781_snd_ctls[] = {

	ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_AMP_LEVEL, 1, 0, 20, 0,

		tas2781_amp_getvol, tas2781_amp_putvol, amp_vol_tlv),

		tas2781_amp_getvol, tas2781_amp_putvol,

		tas2781_amp_tlv),

	ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_DVC_LVL, 0, 0, 200, 1,

		tas2781_digital_getvol, tas2781_digital_putvol, dvc_tlv),

		tas2781_digital_getvol, tas2781_digital_putvol,

		tas2781_dvc_tlv),

	ACARD_SINGLE_BOOL_EXT(NULL, 0, tas2781_force_fwload_get,

		tas2781_force_fwload_put),

};

sound/soc/codecs/tas2781-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -910,10 +910,10 @@ static const struct snd_kcontrol_new tasdevice_cali_controls[] = { 
static const struct snd_kcontrol_new tas2781_snd_controls[] = {

	SOC_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,

		1, 0, 20, 0, tas2781_amp_getvol,

		tas2781_amp_putvol, amp_vol_tlv),

		tas2781_amp_putvol, tas2781_amp_tlv),

	SOC_SINGLE_RANGE_EXT_TLV("Speaker Digital Volume", TAS2781_DVC_LVL,

		0, 0, 200, 1, tas2781_digital_getvol,

		tas2781_digital_putvol, dvc_tlv),

		tas2781_digital_putvol, tas2781_dvc_tlv),

};



static const struct snd_kcontrol_new tas2781_cali_controls[] = {