Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoc: TAS2781: rename the tas2781_reset as tasdevice_reset

Browse Source 
Rename the tas2781_reset as tasdevice_reset in case of misunderstanding.
RESET register for both tas2563 and tas2781 is same and the use of reset
pin is also same.

Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
Link: https://patch.msgid.link/20240709043342.946-1-shenghao-ding@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Shenghao Ding 2024-07-09 12:33:40 +08:00 committed by Mark Brown
parent 54e49a3c9d
commit be5db7581f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sound/tas2781.h
View File

@ -2,7 +2,7 @@
// //
// ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier // ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier
// //
// Copyright (C) 2022 - 2023 Texas Instruments Incorporated // Copyright (C) 2022 - 2024 Texas Instruments Incorporated
// https://www.ti.com // https://www.ti.com
// //
// The TAS2563/TAS2781 driver implements a flexible and configurable // The TAS2563/TAS2781 driver implements a flexible and configurable
@ -43,8 +43,8 @@
(page * 128)) + reg) (page * 128)) + reg)
/*Software Reset */ /*Software Reset */
#define TAS2781_REG_SWRESET TASDEVICE_REG(0x0, 0X0, 0x01) #define TASDEVICE_REG_SWRESET TASDEVICE_REG(0x0, 0X0, 0x01)
#define TAS2781_REG_SWRESET_RESET BIT(0) #define TASDEVICE_REG_SWRESET_RESET BIT(0)
/*I2C Checksum */ /*I2C Checksum */
#define TASDEVICE_I2CChecksum TASDEVICE_REG(0x0, 0x0, 0x7E) #define TASDEVICE_I2CChecksum TASDEVICE_REG(0x0, 0x0, 0x7E)
@ -140,7 +140,7 @@ struct tasdevice_priv {
void (*apply_calibration)(struct tasdevice_priv *tas_priv); void (*apply_calibration)(struct tasdevice_priv *tas_priv);
}; };
void tas2781_reset(struct tasdevice_priv *tas_dev); void tasdevice_reset(struct tasdevice_priv *tas_dev);
int tascodec_init(struct tasdevice_priv *tas_priv, void *codec, int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
struct module *module, struct module *module,
void (*cont)(const struct firmware *fw, void *context)); void (*cont)(const struct firmware *fw, void *context));

4
sound/pci/hda/tas2781_hda_i2c.c
View File

@ -834,7 +834,7 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
pm_runtime_set_active(tas_hda->dev); pm_runtime_set_active(tas_hda->dev);
pm_runtime_enable(tas_hda->dev); pm_runtime_enable(tas_hda->dev);
tas2781_reset(tas_hda->priv); tasdevice_reset(tas_hda->priv);
ret = component_add(tas_hda->dev, &tas2781_hda_comp_ops); ret = component_add(tas_hda->dev, &tas2781_hda_comp_ops);
if (ret) { if (ret) {
@ -929,7 +929,7 @@ static int tas2781_system_resume(struct device *dev)
tas_hda->priv->tasdevice[i].cur_prog = -1; tas_hda->priv->tasdevice[i].cur_prog = -1;
tas_hda->priv->tasdevice[i].cur_conf = -1; tas_hda->priv->tasdevice[i].cur_conf = -1;
} }
tas2781_reset(tas_hda->priv); tasdevice_reset(tas_hda->priv);
tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog); tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog);
/* If calibrated data occurs error, dsp will still work with default /* If calibrated data occurs error, dsp will still work with default

8
sound/soc/codecs/tas2781-comlib.c
View File

@ -243,7 +243,7 @@ struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c)
} }
EXPORT_SYMBOL_GPL(tasdevice_kzalloc); EXPORT_SYMBOL_GPL(tasdevice_kzalloc);
void tas2781_reset(struct tasdevice_priv *tas_dev) void tasdevice_reset(struct tasdevice_priv *tas_dev)
{ {
int ret, i; int ret, i;
@ -254,8 +254,8 @@ void tas2781_reset(struct tasdevice_priv *tas_dev)
} else { } else {
for (i = 0; i < tas_dev->ndev; i++) { for (i = 0; i < tas_dev->ndev; i++) {
ret = tasdevice_dev_write(tas_dev, i, ret = tasdevice_dev_write(tas_dev, i,
TAS2781_REG_SWRESET, TASDEVICE_REG_SWRESET,
TAS2781_REG_SWRESET_RESET); TASDEVICE_REG_SWRESET_RESET);
if (ret < 0) if (ret < 0)
dev_err(tas_dev->dev, dev_err(tas_dev->dev,
"dev %d swreset fail, %d\n", "dev %d swreset fail, %d\n",
@ -264,7 +264,7 @@ void tas2781_reset(struct tasdevice_priv *tas_dev)
} }
usleep_range(1000, 1050); usleep_range(1000, 1050);
} }
EXPORT_SYMBOL_GPL(tas2781_reset); EXPORT_SYMBOL_GPL(tasdevice_reset);
int tascodec_init(struct tasdevice_priv *tas_priv, void *codec, int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
struct module *module, struct module *module,

2
sound/soc/codecs/tas2781-i2c.c
View File

@ -742,6 +742,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c)
if (ret) if (ret)
goto err; goto err;
tasdevice_reset(tas_priv);
ret = devm_snd_soc_register_component(tas_priv->dev, ret = devm_snd_soc_register_component(tas_priv->dev,
&soc_codec_driver_tasdevice, &soc_codec_driver_tasdevice,
tasdevice_dai_driver, ARRAY_SIZE(tasdevice_dai_driver)); tasdevice_dai_driver, ARRAY_SIZE(tasdevice_dai_driver));