* [PATCH v6 1/3] rename tas2764 to tas27xx
@ 2022-04-01 15:02 Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 2/3] rename variables from " Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 3/3] update to support either TAS2764 or TAS2780 Raphael-Xu
0 siblings, 2 replies; 5+ messages in thread
From: Raphael-Xu @ 2022-04-01 15:02 UTC (permalink / raw)
To: broonie; +Cc: navada, alsa-devel, shenghao-ding, raphael-xu, Raphael-Xu
rename tas2764.c and tas2764.h to tas27xx.c and tas27xx.h
rename tas2764 to tas27xx in Kconfig and Makefile
Signed-off-by: Raphael-Xu <13691752556@139.com>
---
sound/soc/codecs/Kconfig | 6 +++---
sound/soc/codecs/Makefile | 4 ++--
sound/soc/codecs/{tas2764.c => tas27xx.c} | 0
sound/soc/codecs/{tas2764.h => tas27xx.h} | 0
4 files changed, 5 insertions(+), 5 deletions(-)
rename sound/soc/codecs/{tas2764.c => tas27xx.c} (100%)
rename sound/soc/codecs/{tas2764.h => tas27xx.h} (100%)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f46a22660103..3aa5f35c1d7c 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -213,7 +213,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_STI_SAS
imply SND_SOC_TAS2552
imply SND_SOC_TAS2562
- imply SND_SOC_TAS2764
+ imply SND_SOC_TAS27XX
imply SND_SOC_TAS2770
imply SND_SOC_TAS5086
imply SND_SOC_TAS571X
@@ -1472,8 +1472,8 @@ config SND_SOC_TAS2562
tristate "Texas Instruments TAS2562 Mono Audio amplifier"
depends on I2C
-config SND_SOC_TAS2764
- tristate "Texas Instruments TAS2764 Mono Audio amplifier"
+config SND_SOC_TAS27XX
+ tristate "Texas Instruments TAS27xx Mono Audio amplifier"
depends on I2C
config SND_SOC_TAS2770
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 8637e9e869e3..15ceb95d42f5 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -337,7 +337,7 @@ snd-soc-simple-amplifier-objs := simple-amplifier.o
snd-soc-tpa6130a2-objs := tpa6130a2.o
snd-soc-tas2552-objs := tas2552.o
snd-soc-tas2562-objs := tas2562.o
-snd-soc-tas2764-objs := tas2764.o
+snd-soc-tas27xx-objs := tas27xx.o
# Mux
snd-soc-simple-mux-objs := simple-mux.o
@@ -574,7 +574,7 @@ obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o
obj-$(CONFIG_SND_SOC_STI_SAS) += snd-soc-sti-sas.o
obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o
obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o
-obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o
+obj-$(CONFIG_SND_SOC_TAS27XX) += snd-soc-tas27xx.o
obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o
obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o
obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o
diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas27xx.c
similarity index 100%
rename from sound/soc/codecs/tas2764.c
rename to sound/soc/codecs/tas27xx.c
diff --git a/sound/soc/codecs/tas2764.h b/sound/soc/codecs/tas27xx.h
similarity index 100%
rename from sound/soc/codecs/tas2764.h
rename to sound/soc/codecs/tas27xx.h
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v6 2/3] rename variables from tas2764 to tas27xx
2022-04-01 15:02 [PATCH v6 1/3] rename tas2764 to tas27xx Raphael-Xu
@ 2022-04-01 15:03 ` Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 3/3] update to support either TAS2764 or TAS2780 Raphael-Xu
1 sibling, 0 replies; 5+ messages in thread
From: Raphael-Xu @ 2022-04-01 15:03 UTC (permalink / raw)
To: broonie; +Cc: navada, alsa-devel, shenghao-ding, raphael-xu, Raphael-Xu
rename variables from TAS2764 to TAS27xx in tas27xx.h
rename variables from tas2764 to tas27xx and add enum in tas27xx.c
Signed-off-by: Raphael-Xu <13691752556@139.com>
---
sound/soc/codecs/tas27xx.c | 510 +++++++++++++++++++------------------
sound/soc/codecs/tas27xx.h | 131 +++++-----
2 files changed, 334 insertions(+), 307 deletions(-)
diff --git a/sound/soc/codecs/tas27xx.c b/sound/soc/codecs/tas27xx.c
index 9265af41c235..8953516b55dc 100644
--- a/sound/soc/codecs/tas27xx.c
+++ b/sound/soc/codecs/tas27xx.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
-//
-// Driver for the Texas Instruments TAS2764 CODEC
-// Copyright (C) 2020 Texas Instruments Inc.
+// Driver for the Texas Instruments TAS2764 Mono
+// Audio amplifier
+// Copyright (C) 2020-2022 Texas Instruments Inc.
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -23,9 +23,9 @@
#include <sound/initval.h>
#include <sound/tlv.h>
-#include "tas2764.h"
+#include "tas27xx.h"
-struct tas2764_priv {
+struct tas27xx_priv {
struct snd_soc_component *component;
struct gpio_desc *reset_gpio;
struct gpio_desc *sdz_gpio;
@@ -36,43 +36,48 @@ struct tas2764_priv {
int i_sense_slot;
};
-static void tas2764_reset(struct tas2764_priv *tas2764)
+enum tas27xx {
+ TAS2764 = 0,
+};
+
+static void tas27xx_reset(struct tas27xx_priv *tas27xx)
{
- if (tas2764->reset_gpio) {
- gpiod_set_value_cansleep(tas2764->reset_gpio, 0);
+ if (tas27xx->reset_gpio) {
+ gpiod_set_value_cansleep(tas27xx->reset_gpio, 0);
msleep(20);
- gpiod_set_value_cansleep(tas2764->reset_gpio, 1);
+ gpiod_set_value_cansleep(tas27xx->reset_gpio, 1);
}
- snd_soc_component_write(tas2764->component, TAS2764_SW_RST,
- TAS2764_RST);
+ snd_soc_component_write(tas27xx->component, TAS27XX_SW_RST,
+ TAS27XX_RST);
}
-static int tas2764_set_bias_level(struct snd_soc_component *component,
+static int tas27xx_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level)
{
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
switch (level) {
case SND_SOC_BIAS_ON:
- snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_ACTIVE);
+ snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_ACTIVE);
break;
case SND_SOC_BIAS_STANDBY:
case SND_SOC_BIAS_PREPARE:
- snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_MUTE);
+ snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_MUTE);
break;
case SND_SOC_BIAS_OFF:
- snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_SHUTDOWN);
+ snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_SHUTDOWN);
break;
default:
- dev_err(tas2764->dev,
+ dev_err(tas27xx->dev,
"wrong power level setting %d\n", level);
return -EINVAL;
}
@@ -81,81 +86,87 @@ static int tas2764_set_bias_level(struct snd_soc_component *component,
}
#ifdef CONFIG_PM
-static int tas2764_codec_suspend(struct snd_soc_component *component)
+static int tas27xx_codec_suspend(struct snd_soc_component *component)
{
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int ret;
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_SHUTDOWN);
+ ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_SHUTDOWN);
if (ret < 0)
return ret;
- if (tas2764->sdz_gpio)
- gpiod_set_value_cansleep(tas2764->sdz_gpio, 0);
+ if (tas27xx->sdz_gpio)
+ gpiod_set_value_cansleep(tas27xx->sdz_gpio, 0);
- regcache_cache_only(tas2764->regmap, true);
- regcache_mark_dirty(tas2764->regmap);
+ regcache_cache_only(tas27xx->regmap, true);
+ regcache_mark_dirty(tas27xx->regmap);
return 0;
}
-static int tas2764_codec_resume(struct snd_soc_component *component)
+static int tas27xx_codec_resume(struct snd_soc_component *component)
{
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int ret;
- if (tas2764->sdz_gpio)
- gpiod_set_value_cansleep(tas2764->sdz_gpio, 1);
+ if (tas27xx->sdz_gpio)
+ gpiod_set_value_cansleep(tas27xx->sdz_gpio, 1);
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_ACTIVE);
+ ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_ACTIVE);
if (ret < 0)
return ret;
- regcache_cache_only(tas2764->regmap, false);
+ regcache_cache_only(tas27xx->regmap, false);
- return regcache_sync(tas2764->regmap);
+ return regcache_sync(tas27xx->regmap);
}
#else
-#define tas2764_codec_suspend NULL
-#define tas2764_codec_resume NULL
+#define tas27xx_codec_suspend NULL
+#define tas27xx_codec_resume NULL
#endif
-static const char * const tas2764_ASI1_src[] = {
+static const char * const tas27xx_ASI1_src[] = {
"I2C offset", "Left", "Right", "LeftRightDiv2",
};
static SOC_ENUM_SINGLE_DECL(
- tas2764_ASI1_src_enum, TAS2764_TDM_CFG2, 4, tas2764_ASI1_src);
+ tas27xx_ASI1_src_enum, TAS27XX_TDM_CFG2, 4, tas27xx_ASI1_src);
-static const struct snd_kcontrol_new tas2764_asi1_mux =
- SOC_DAPM_ENUM("ASI1 Source", tas2764_ASI1_src_enum);
+static const struct snd_kcontrol_new tas27xx_asi1_mux =
+ SOC_DAPM_ENUM("ASI1 Source", tas27xx_ASI1_src_enum);
-static int tas2764_dac_event(struct snd_soc_dapm_widget *w,
+static int tas27xx_dac_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
- struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int ret;
switch (event) {
case SND_SOC_DAPM_POST_PMU:
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_MUTE);
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_MUTE);
break;
case SND_SOC_DAPM_PRE_PMD:
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_SHUTDOWN);
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_SHUTDOWN);
break;
default:
- dev_err(tas2764->dev, "Unsupported event\n");
+ dev_err(tas27xx->dev, "Unsupported event\n");
return -EINVAL;
}
@@ -166,25 +177,27 @@ static int tas2764_dac_event(struct snd_soc_dapm_widget *w,
}
static const struct snd_kcontrol_new isense_switch =
- SOC_DAPM_SINGLE("Switch", TAS2764_PWR_CTRL, TAS2764_ISENSE_POWER_EN, 1, 1);
+ SOC_DAPM_SINGLE("Switch", TAS27XX_PWR_CTRL,
+ TAS27XX_ISENSE_POWER_EN, 1, 1);
static const struct snd_kcontrol_new vsense_switch =
- SOC_DAPM_SINGLE("Switch", TAS2764_PWR_CTRL, TAS2764_VSENSE_POWER_EN, 1, 1);
+ SOC_DAPM_SINGLE("Switch", TAS27XX_PWR_CTRL,
+ TAS27XX_VSENSE_POWER_EN, 1, 1);
-static const struct snd_soc_dapm_widget tas2764_dapm_widgets[] = {
+static const struct snd_soc_dapm_widget tas27xx_dapm_widgets[] = {
SND_SOC_DAPM_AIF_IN("ASI1", "ASI1 Playback", 0, SND_SOC_NOPM, 0, 0),
- SND_SOC_DAPM_MUX("ASI1 Sel", SND_SOC_NOPM, 0, 0, &tas2764_asi1_mux),
- SND_SOC_DAPM_SWITCH("ISENSE", TAS2764_PWR_CTRL, TAS2764_ISENSE_POWER_EN,
- 1, &isense_switch),
- SND_SOC_DAPM_SWITCH("VSENSE", TAS2764_PWR_CTRL, TAS2764_VSENSE_POWER_EN,
- 1, &vsense_switch),
- SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, tas2764_dac_event,
+ SND_SOC_DAPM_MUX("ASI1 Sel", SND_SOC_NOPM, 0, 0, &tas27xx_asi1_mux),
+ SND_SOC_DAPM_SWITCH("ISENSE", TAS27XX_PWR_CTRL,
+ TAS27XX_ISENSE_POWER_EN, 1, &isense_switch),
+ SND_SOC_DAPM_SWITCH("VSENSE", TAS27XX_PWR_CTRL,
+ TAS27XX_VSENSE_POWER_EN, 1, &vsense_switch),
+ SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, tas27xx_dac_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_OUTPUT("OUT"),
SND_SOC_DAPM_SIGGEN("VMON"),
SND_SOC_DAPM_SIGGEN("IMON")
};
-static const struct snd_soc_dapm_route tas2764_audio_map[] = {
+static const struct snd_soc_dapm_route tas27xx_audio_map[] = {
{"ASI1 Sel", "I2C offset", "ASI1"},
{"ASI1 Sel", "Left", "ASI1"},
{"ASI1 Sel", "Right", "ASI1"},
@@ -195,14 +208,14 @@ static const struct snd_soc_dapm_route tas2764_audio_map[] = {
{"VSENSE", "Switch", "VMON"},
};
-static int tas2764_mute(struct snd_soc_dai *dai, int mute, int direction)
+static int tas27xx_mute(struct snd_soc_dai *dai, int mute, int direction)
{
struct snd_soc_component *component = dai->component;
int ret;
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- mute ? TAS2764_PWR_CTRL_MUTE : 0);
+ ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ mute ? TAS27XX_PWR_CTRL_MUTE : 0);
if (ret < 0)
return ret;
@@ -210,9 +223,9 @@ static int tas2764_mute(struct snd_soc_dai *dai, int mute, int direction)
return 0;
}
-static int tas2764_set_bitwidth(struct tas2764_priv *tas2764, int bitwidth)
+static int tas27xx_set_bitwidth(struct tas27xx_priv *tas27xx, int bitwidth)
{
- struct snd_soc_component *component = tas2764->component;
+ struct snd_soc_component *component = tas27xx->component;
int sense_en;
int val;
int ret;
@@ -220,21 +233,21 @@ static int tas2764_set_bitwidth(struct tas2764_priv *tas2764, int bitwidth)
switch (bitwidth) {
case SNDRV_PCM_FORMAT_S16_LE:
ret = snd_soc_component_update_bits(component,
- TAS2764_TDM_CFG2,
- TAS2764_TDM_CFG2_RXW_MASK,
- TAS2764_TDM_CFG2_RXW_16BITS);
+ TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXW_MASK,
+ TAS27XX_TDM_CFG2_RXW_16BITS);
break;
case SNDRV_PCM_FORMAT_S24_LE:
ret = snd_soc_component_update_bits(component,
- TAS2764_TDM_CFG2,
- TAS2764_TDM_CFG2_RXW_MASK,
- TAS2764_TDM_CFG2_RXW_24BITS);
+ TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXW_MASK,
+ TAS27XX_TDM_CFG2_RXW_24BITS);
break;
case SNDRV_PCM_FORMAT_S32_LE:
ret = snd_soc_component_update_bits(component,
- TAS2764_TDM_CFG2,
- TAS2764_TDM_CFG2_RXW_MASK,
- TAS2764_TDM_CFG2_RXW_32BITS);
+ TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXW_MASK,
+ TAS27XX_TDM_CFG2_RXW_32BITS);
break;
default:
@@ -244,65 +257,64 @@ static int tas2764_set_bitwidth(struct tas2764_priv *tas2764, int bitwidth)
if (ret < 0)
return ret;
- val = snd_soc_component_read(tas2764->component, TAS2764_PWR_CTRL);
+ val = snd_soc_component_read(tas27xx->component, TAS27XX_PWR_CTRL);
if (val < 0)
return val;
- if (val & (1 << TAS2764_VSENSE_POWER_EN))
+ if (val & (1 << TAS27XX_VSENSE_POWER_EN))
sense_en = 0;
else
- sense_en = TAS2764_TDM_CFG5_VSNS_ENABLE;
+ sense_en = TAS27XX_TDM_CFG5_VSNS_ENABLE;
- ret = snd_soc_component_update_bits(tas2764->component, TAS2764_TDM_CFG5,
- TAS2764_TDM_CFG5_VSNS_ENABLE,
- sense_en);
+ ret = snd_soc_component_update_bits(tas27xx->component,
+ TAS27XX_TDM_CFG5, TAS27XX_TDM_CFG5_VSNS_ENABLE, sense_en);
if (ret < 0)
return ret;
- if (val & (1 << TAS2764_ISENSE_POWER_EN))
+ if (val & (1 << TAS27XX_ISENSE_POWER_EN))
sense_en = 0;
else
- sense_en = TAS2764_TDM_CFG6_ISNS_ENABLE;
+ sense_en = TAS27XX_TDM_CFG6_ISNS_ENABLE;
- ret = snd_soc_component_update_bits(tas2764->component, TAS2764_TDM_CFG6,
- TAS2764_TDM_CFG6_ISNS_ENABLE,
- sense_en);
+ ret = snd_soc_component_update_bits(tas27xx->component,
+ TAS27XX_TDM_CFG6, TAS27XX_TDM_CFG6_ISNS_ENABLE, sense_en);
if (ret < 0)
return ret;
return 0;
}
-static int tas2764_set_samplerate(struct tas2764_priv *tas2764, int samplerate)
+static int tas27xx_set_samplerate(
+ struct tas27xx_priv *tas27xx, int samplerate)
{
- struct snd_soc_component *component = tas2764->component;
+ struct snd_soc_component *component = tas27xx->component;
int ramp_rate_val;
int ret;
switch (samplerate) {
case 48000:
- ramp_rate_val = TAS2764_TDM_CFG0_SMP_48KHZ |
- TAS2764_TDM_CFG0_44_1_48KHZ;
+ ramp_rate_val = TAS27XX_TDM_CFG0_SMP_48KHZ |
+ TAS27XX_TDM_CFG0_44_1_48KHZ;
break;
case 44100:
- ramp_rate_val = TAS2764_TDM_CFG0_SMP_44_1KHZ |
- TAS2764_TDM_CFG0_44_1_48KHZ;
+ ramp_rate_val = TAS27XX_TDM_CFG0_SMP_44_1KHZ |
+ TAS27XX_TDM_CFG0_44_1_48KHZ;
break;
case 96000:
- ramp_rate_val = TAS2764_TDM_CFG0_SMP_48KHZ |
- TAS2764_TDM_CFG0_88_2_96KHZ;
+ ramp_rate_val = TAS27XX_TDM_CFG0_SMP_48KHZ |
+ TAS27XX_TDM_CFG0_88_2_96KHZ;
break;
case 88200:
- ramp_rate_val = TAS2764_TDM_CFG0_SMP_44_1KHZ |
- TAS2764_TDM_CFG0_88_2_96KHZ;
+ ramp_rate_val = TAS27XX_TDM_CFG0_SMP_44_1KHZ |
+ TAS27XX_TDM_CFG0_88_2_96KHZ;
break;
default:
return -EINVAL;
}
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG0,
- TAS2764_TDM_CFG0_SMP_MASK |
- TAS2764_TDM_CFG0_MASK,
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG0,
+ TAS27XX_TDM_CFG0_SMP_MASK |
+ TAS27XX_TDM_CFG0_MASK,
ramp_rate_val);
if (ret < 0)
return ret;
@@ -310,43 +322,45 @@ static int tas2764_set_samplerate(struct tas2764_priv *tas2764, int samplerate)
return 0;
}
-static int tas2764_hw_params(struct snd_pcm_substream *substream,
+static int tas27xx_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
struct snd_soc_component *component = dai->component;
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int ret;
- ret = tas2764_set_bitwidth(tas2764, params_format(params));
+ ret = tas27xx_set_bitwidth(tas27xx, params_format(params));
if (ret < 0)
return ret;
- return tas2764_set_samplerate(tas2764, params_rate(params));
+ return tas27xx_set_samplerate(tas27xx, params_rate(params));
}
-static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+static int tas27xx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
struct snd_soc_component *component = dai->component;
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0;
int iface;
int ret;
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_NB_NF:
- asi_cfg_1 = TAS2764_TDM_CFG1_RX_RISING;
+ asi_cfg_1 = TAS27XX_TDM_CFG1_RX_RISING;
break;
case SND_SOC_DAIFMT_IB_NF:
- asi_cfg_1 = TAS2764_TDM_CFG1_RX_FALLING;
+ asi_cfg_1 = TAS27XX_TDM_CFG1_RX_FALLING;
break;
default:
- dev_err(tas2764->dev, "ASI format Inverse is not found\n");
+ dev_err(tas27xx->dev, "ASI format Inverse is not found\n");
return -EINVAL;
}
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG1,
- TAS2764_TDM_CFG1_RX_MASK,
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG1,
+ TAS27XX_TDM_CFG1_RX_MASK,
asi_cfg_1);
if (ret < 0)
return ret;
@@ -354,41 +368,42 @@ static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
case SND_SOC_DAIFMT_DSP_A:
- iface = TAS2764_TDM_CFG2_SCFG_I2S;
+ iface = TAS27XX_TDM_CFG2_SCFG_I2S;
tdm_rx_start_slot = 1;
break;
case SND_SOC_DAIFMT_DSP_B:
case SND_SOC_DAIFMT_LEFT_J:
- iface = TAS2764_TDM_CFG2_SCFG_LEFT_J;
+ iface = TAS27XX_TDM_CFG2_SCFG_LEFT_J;
tdm_rx_start_slot = 0;
break;
default:
- dev_err(tas2764->dev,
+ dev_err(tas27xx->dev,
"DAI Format is not found, fmt=0x%x\n", fmt);
return -EINVAL;
}
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG1,
- TAS2764_TDM_CFG1_MASK,
- (tdm_rx_start_slot << TAS2764_TDM_CFG1_51_SHIFT));
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG1,
+ TAS27XX_TDM_CFG1_MASK,
+ (tdm_rx_start_slot << TAS27XX_TDM_CFG1_51_SHIFT));
if (ret < 0)
return ret;
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG2,
- TAS2764_TDM_CFG2_SCFG_MASK, iface);
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_SCFG_MASK, iface);
if (ret < 0)
return ret;
return 0;
}
-static int tas2764_set_dai_tdm_slot(struct snd_soc_dai *dai,
+static int tas27xx_set_dai_tdm_slot(struct snd_soc_dai *dai,
unsigned int tx_mask,
unsigned int rx_mask,
int slots, int slot_width)
{
struct snd_soc_component *component = dai->component;
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int left_slot, right_slot;
int slots_cfg;
int slot_size;
@@ -416,159 +431,162 @@ static int tas2764_set_dai_tdm_slot(struct snd_soc_dai *dai,
if (tx_mask != 0 || left_slot >= slots || right_slot >= slots)
return -EINVAL;
- slots_cfg = (right_slot << TAS2764_TDM_CFG3_RXS_SHIFT) | left_slot;
+ slots_cfg = (right_slot << TAS27XX_TDM_CFG3_RXS_SHIFT) | left_slot;
- ret = snd_soc_component_write(component, TAS2764_TDM_CFG3, slots_cfg);
+ ret = snd_soc_component_write(component, TAS27XX_TDM_CFG3, slots_cfg);
if (ret)
return ret;
switch (slot_width) {
case 16:
- slot_size = TAS2764_TDM_CFG2_RXS_16BITS;
+ slot_size = TAS27XX_TDM_CFG2_RXS_16BITS;
break;
case 24:
- slot_size = TAS2764_TDM_CFG2_RXS_24BITS;
+ slot_size = TAS27XX_TDM_CFG2_RXS_24BITS;
break;
case 32:
- slot_size = TAS2764_TDM_CFG2_RXS_32BITS;
+ slot_size = TAS27XX_TDM_CFG2_RXS_32BITS;
break;
default:
return -EINVAL;
}
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG2,
- TAS2764_TDM_CFG2_RXS_MASK,
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXS_MASK,
slot_size);
if (ret < 0)
return ret;
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG5,
- TAS2764_TDM_CFG5_50_MASK,
- tas2764->v_sense_slot);
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG5,
+ TAS27XX_TDM_CFG5_50_MASK,
+ tas27xx->v_sense_slot);
if (ret < 0)
return ret;
- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG6,
- TAS2764_TDM_CFG6_50_MASK,
- tas2764->i_sense_slot);
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG6,
+ TAS27XX_TDM_CFG6_50_MASK,
+ tas27xx->i_sense_slot);
if (ret < 0)
return ret;
return 0;
}
-static const struct snd_soc_dai_ops tas2764_dai_ops = {
- .mute_stream = tas2764_mute,
- .hw_params = tas2764_hw_params,
- .set_fmt = tas2764_set_fmt,
- .set_tdm_slot = tas2764_set_dai_tdm_slot,
+static const struct snd_soc_dai_ops tas27xx_dai_ops = {
+ .mute_stream = tas27xx_mute,
+ .hw_params = tas27xx_hw_params,
+ .set_fmt = tas27xx_set_fmt,
+ .set_tdm_slot = tas27xx_set_dai_tdm_slot,
.no_capture_mute = 1,
};
-#define TAS2764_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
+#define TAS27XX_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
-#define TAS2764_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+#define TAS27XX_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_88200)
-static struct snd_soc_dai_driver tas2764_dai_driver[] = {
+static struct snd_soc_dai_driver tas27xx_dai_driver[] = {
{
- .name = "tas2764 ASI1",
+ .name = "tas27xx ASI1",
.id = 0,
.playback = {
.stream_name = "ASI1 Playback",
.channels_min = 2,
.channels_max = 2,
- .rates = TAS2764_RATES,
- .formats = TAS2764_FORMATS,
+ .rates = TAS27XX_RATES,
+ .formats = TAS27XX_FORMATS,
},
.capture = {
.stream_name = "ASI1 Capture",
.channels_min = 0,
.channels_max = 2,
- .rates = TAS2764_RATES,
- .formats = TAS2764_FORMATS,
+ .rates = TAS27XX_RATES,
+ .formats = TAS27XX_FORMATS,
},
- .ops = &tas2764_dai_ops,
+ .ops = &tas27xx_dai_ops,
.symmetric_rate = 1,
},
};
-static int tas2764_codec_probe(struct snd_soc_component *component)
+static int tas27xx_codec_probe(struct snd_soc_component *component)
{
- struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
int ret;
- tas2764->component = component;
+ tas27xx->component = component;
- if (tas2764->sdz_gpio)
- gpiod_set_value_cansleep(tas2764->sdz_gpio, 1);
+ if (tas27xx->sdz_gpio)
+ gpiod_set_value_cansleep(tas27xx->sdz_gpio, 1);
- tas2764_reset(tas2764);
+ tas27xx_reset(tas27xx);
- ret = snd_soc_component_update_bits(tas2764->component, TAS2764_TDM_CFG5,
- TAS2764_TDM_CFG5_VSNS_ENABLE, 0);
+ ret = snd_soc_component_update_bits(tas27xx->component,
+ TAS27XX_TDM_CFG5,
+ TAS27XX_TDM_CFG5_VSNS_ENABLE, 0);
if (ret < 0)
return ret;
- ret = snd_soc_component_update_bits(tas2764->component, TAS2764_TDM_CFG6,
- TAS2764_TDM_CFG6_ISNS_ENABLE, 0);
+ ret = snd_soc_component_update_bits(tas27xx->component,
+ TAS27XX_TDM_CFG6,
+ TAS27XX_TDM_CFG6_ISNS_ENABLE, 0);
if (ret < 0)
return ret;
- ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
- TAS2764_PWR_CTRL_MASK,
- TAS2764_PWR_CTRL_MUTE);
+ ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_MUTE);
if (ret < 0)
return ret;
return 0;
}
-static DECLARE_TLV_DB_SCALE(tas2764_digital_tlv, 1100, 50, 0);
-static DECLARE_TLV_DB_SCALE(tas2764_playback_volume, -10000, 50, 0);
+static DECLARE_TLV_DB_SCALE(tas27xx_digital_tlv, 1100, 50, 0);
+static DECLARE_TLV_DB_SCALE(tas27xx_playback_volume, -10000, 50, 0);
-static const struct snd_kcontrol_new tas2764_snd_controls[] = {
- SOC_SINGLE_TLV("Speaker Volume", TAS2764_DVC, 0,
- TAS2764_DVC_MAX, 1, tas2764_playback_volume),
- SOC_SINGLE_TLV("Amp Gain Volume", TAS2764_CHNL_0, 0, 0x14, 0,
- tas2764_digital_tlv),
+static const struct snd_kcontrol_new tas27xx_snd_controls[] = {
+ SOC_SINGLE_TLV("Speaker Volume", TAS27XX_DVC, 0,
+ TAS27XX_DVC_MAX, 1, tas27xx_playback_volume),
+ SOC_SINGLE_TLV("Amp Gain Volume", TAS27XX_CHNL_0, 0, 0x14, 0,
+ tas27xx_digital_tlv),
};
-static const struct snd_soc_component_driver soc_component_driver_tas2764 = {
- .probe = tas2764_codec_probe,
- .suspend = tas2764_codec_suspend,
- .resume = tas2764_codec_resume,
- .set_bias_level = tas2764_set_bias_level,
- .controls = tas2764_snd_controls,
- .num_controls = ARRAY_SIZE(tas2764_snd_controls),
- .dapm_widgets = tas2764_dapm_widgets,
- .num_dapm_widgets = ARRAY_SIZE(tas2764_dapm_widgets),
- .dapm_routes = tas2764_audio_map,
- .num_dapm_routes = ARRAY_SIZE(tas2764_audio_map),
+static const struct snd_soc_component_driver soc_component_driver_tas27xx = {
+ .probe = tas27xx_codec_probe,
+ .suspend = tas27xx_codec_suspend,
+ .resume = tas27xx_codec_resume,
+ .set_bias_level = tas27xx_set_bias_level,
+ .controls = tas27xx_snd_controls,
+ .num_controls = ARRAY_SIZE(tas27xx_snd_controls),
+ .dapm_widgets = tas27xx_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(tas27xx_dapm_widgets),
+ .dapm_routes = tas27xx_audio_map,
+ .num_dapm_routes = ARRAY_SIZE(tas27xx_audio_map),
.idle_bias_on = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
};
-static const struct reg_default tas2764_reg_defaults[] = {
- { TAS2764_PAGE, 0x00 },
- { TAS2764_SW_RST, 0x00 },
- { TAS2764_PWR_CTRL, 0x1a },
- { TAS2764_DVC, 0x00 },
- { TAS2764_CHNL_0, 0x00 },
- { TAS2764_TDM_CFG0, 0x09 },
- { TAS2764_TDM_CFG1, 0x02 },
- { TAS2764_TDM_CFG2, 0x0a },
- { TAS2764_TDM_CFG3, 0x10 },
- { TAS2764_TDM_CFG5, 0x42 },
+static const struct reg_default tas27xx_reg_defaults[] = {
+ { TAS27XX_PAGE, 0x00 },
+ { TAS27XX_SW_RST, 0x00 },
+ { TAS27XX_PWR_CTRL, 0x1a },
+ { TAS27XX_DVC, 0x00 },
+ { TAS27XX_CHNL_0, 0x00 },
+ { TAS27XX_TDM_CFG0, 0x09 },
+ { TAS27XX_TDM_CFG1, 0x02 },
+ { TAS27XX_TDM_CFG2, 0x0a },
+ { TAS27XX_TDM_CFG3, 0x10 },
+ { TAS27XX_TDM_CFG5, 0x42 },
};
-static const struct regmap_range_cfg tas2764_regmap_ranges[] = {
+static const struct regmap_range_cfg tas27xx_regmap_ranges[] = {
{
.range_min = 0,
.range_max = 1 * 128,
- .selector_reg = TAS2764_PAGE,
+ .selector_reg = TAS27XX_PAGE,
.selector_mask = 0xff,
.selector_shift = 0,
.window_start = 0,
@@ -576,113 +594,113 @@ static const struct regmap_range_cfg tas2764_regmap_ranges[] = {
},
};
-static const struct regmap_config tas2764_i2c_regmap = {
+static const struct regmap_config tas27xx_i2c_regmap = {
.reg_bits = 8,
.val_bits = 8,
- .reg_defaults = tas2764_reg_defaults,
- .num_reg_defaults = ARRAY_SIZE(tas2764_reg_defaults),
+ .reg_defaults = tas27xx_reg_defaults,
+ .num_reg_defaults = ARRAY_SIZE(tas27xx_reg_defaults),
.cache_type = REGCACHE_RBTREE,
- .ranges = tas2764_regmap_ranges,
- .num_ranges = ARRAY_SIZE(tas2764_regmap_ranges),
+ .ranges = tas27xx_regmap_ranges,
+ .num_ranges = ARRAY_SIZE(tas27xx_regmap_ranges),
.max_register = 1 * 128,
};
-static int tas2764_parse_dt(struct device *dev, struct tas2764_priv *tas2764)
+static int tas27xx_parse_dt(struct device *dev, struct tas27xx_priv *tas27xx)
{
int ret = 0;
- tas2764->reset_gpio = devm_gpiod_get_optional(tas2764->dev, "reset",
+ tas27xx->reset_gpio = devm_gpiod_get_optional(tas27xx->dev, "reset",
GPIOD_OUT_HIGH);
- if (IS_ERR(tas2764->reset_gpio)) {
- if (PTR_ERR(tas2764->reset_gpio) == -EPROBE_DEFER) {
- tas2764->reset_gpio = NULL;
+ if (IS_ERR(tas27xx->reset_gpio)) {
+ if (PTR_ERR(tas27xx->reset_gpio) == -EPROBE_DEFER) {
+ tas27xx->reset_gpio = NULL;
return -EPROBE_DEFER;
}
}
- tas2764->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH);
- if (IS_ERR(tas2764->sdz_gpio)) {
- if (PTR_ERR(tas2764->sdz_gpio) == -EPROBE_DEFER)
+ tas27xx->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown",
+ GPIOD_OUT_HIGH);
+ if (IS_ERR(tas27xx->sdz_gpio)) {
+ if (PTR_ERR(tas27xx->sdz_gpio) == -EPROBE_DEFER)
return -EPROBE_DEFER;
- tas2764->sdz_gpio = NULL;
+ tas27xx->sdz_gpio = NULL;
}
ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no",
- &tas2764->i_sense_slot);
+ &tas27xx->i_sense_slot);
if (ret)
- tas2764->i_sense_slot = 0;
+ tas27xx->i_sense_slot = 0;
ret = fwnode_property_read_u32(dev->fwnode, "ti,vmon-slot-no",
- &tas2764->v_sense_slot);
+ &tas27xx->v_sense_slot);
if (ret)
- tas2764->v_sense_slot = 2;
+ tas27xx->v_sense_slot = 2;
return 0;
}
-static int tas2764_i2c_probe(struct i2c_client *client,
+static int tas27xx_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct tas2764_priv *tas2764;
+ struct tas27xx_priv *tas27xx;
int result;
- tas2764 = devm_kzalloc(&client->dev, sizeof(struct tas2764_priv),
+ tas27xx = devm_kzalloc(&client->dev, sizeof(struct tas27xx_priv),
GFP_KERNEL);
- if (!tas2764)
+ if (!tas27xx)
return -ENOMEM;
- tas2764->dev = &client->dev;
- i2c_set_clientdata(client, tas2764);
- dev_set_drvdata(&client->dev, tas2764);
+ tas27xx->dev = &client->dev;
+ i2c_set_clientdata(client, tas27xx);
+ dev_set_drvdata(&client->dev, tas27xx);
- tas2764->regmap = devm_regmap_init_i2c(client, &tas2764_i2c_regmap);
- if (IS_ERR(tas2764->regmap)) {
- result = PTR_ERR(tas2764->regmap);
+ tas27xx->regmap = devm_regmap_init_i2c(client, &tas27xx_i2c_regmap);
+ if (IS_ERR(tas27xx->regmap)) {
+ result = PTR_ERR(tas27xx->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n",
result);
return result;
}
if (client->dev.of_node) {
- result = tas2764_parse_dt(&client->dev, tas2764);
+ result = tas27xx_parse_dt(&client->dev, tas27xx);
if (result) {
- dev_err(tas2764->dev, "%s: Failed to parse devicetree\n",
- __func__);
+ dev_err(tas27xx->dev,
+ "%s: Failed to parse devicetree\n", __func__);
return result;
}
}
- return devm_snd_soc_register_component(tas2764->dev,
- &soc_component_driver_tas2764,
- tas2764_dai_driver,
- ARRAY_SIZE(tas2764_dai_driver));
+ return devm_snd_soc_register_component(tas27xx->dev,
+ &soc_component_driver_tas27xx, tas27xx_dai_driver,
+ ARRAY_SIZE(tas27xx_dai_driver));
}
-static const struct i2c_device_id tas2764_i2c_id[] = {
- { "tas2764", 0},
+static const struct i2c_device_id tas27xx_i2c_id[] = {
+ { "tas2764", TAS2764},
{ }
};
-MODULE_DEVICE_TABLE(i2c, tas2764_i2c_id);
+MODULE_DEVICE_TABLE(i2c, tas27xx_i2c_id);
#if defined(CONFIG_OF)
-static const struct of_device_id tas2764_of_match[] = {
+static const struct of_device_id tas27xx_of_match[] = {
{ .compatible = "ti,tas2764" },
{},
};
-MODULE_DEVICE_TABLE(of, tas2764_of_match);
+MODULE_DEVICE_TABLE(of, tas27xx_of_match);
#endif
-static struct i2c_driver tas2764_i2c_driver = {
+static struct i2c_driver tas27xx_i2c_driver = {
.driver = {
- .name = "tas2764",
- .of_match_table = of_match_ptr(tas2764_of_match),
+ .name = "tas27xx",
+ .of_match_table = of_match_ptr(tas27xx_of_match),
},
- .probe = tas2764_i2c_probe,
- .id_table = tas2764_i2c_id,
+ .probe = tas27xx_i2c_probe,
+ .id_table = tas27xx_i2c_id,
};
-module_i2c_driver(tas2764_i2c_driver);
+module_i2c_driver(tas27xx_i2c_driver);
-MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com>");
-MODULE_DESCRIPTION("TAS2764 I2C Smart Amplifier driver");
+MODULE_AUTHOR("Raphael Xu <raphael-xu@ti.com>");
+MODULE_DESCRIPTION("TAS27XX I2C Smart Amplifier driver");
MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/tas27xx.h b/sound/soc/codecs/tas27xx.h
index 67d6fd903c42..6f76645f5cd6 100644
--- a/sound/soc/codecs/tas27xx.h
+++ b/sound/soc/codecs/tas27xx.h
@@ -1,92 +1,101 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * tas2764.h - ALSA SoC Texas Instruments TAS2764 Mono Audio Amplifier
+ * tas27xx.h - ALSA SoC Texas Instruments TAS2764 Mono Audio Amplifier
*
- * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com
+ * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com
*
- * Author: Dan Murphy <dmurphy@ti.com>
+ * Author: Raphael Xu <raphael-xu@ti.com>
*/
-#ifndef __TAS2764__
-#define __TAS2764__
+#ifndef __TAS27XX_H__
+#define __TAS27XX_H__
/* Book Control Register */
-#define TAS2764_BOOKCTL_PAGE 0
-#define TAS2764_BOOKCTL_REG 127
-#define TAS2764_REG(page, reg) ((page * 128) + reg)
+#define TAS27XX_BOOKCTL_PAGE 0
+#define TAS27XX_BOOKCTL_REG 127
+#define TAS27XX_REG(page, reg) ((page * 128) + reg)
/* Page */
-#define TAS2764_PAGE TAS2764_REG(0X0, 0x00)
-#define TAS2764_PAGE_PAGE_MASK 255
+#define TAS27XX_PAGE TAS27XX_REG(0X0, 0x00)
+#define TAS27XX_PAGE_PAGE_MASK 255
/* Software Reset */
-#define TAS2764_SW_RST TAS2764_REG(0X0, 0x01)
-#define TAS2764_RST BIT(0)
+#define TAS27XX_SW_RST TAS27XX_REG(0X0, 0x01)
+#define TAS27XX_RST BIT(0)
/* Power Control */
-#define TAS2764_PWR_CTRL TAS2764_REG(0X0, 0x02)
-#define TAS2764_PWR_CTRL_MASK GENMASK(1, 0)
-#define TAS2764_PWR_CTRL_ACTIVE 0x0
-#define TAS2764_PWR_CTRL_MUTE BIT(0)
-#define TAS2764_PWR_CTRL_SHUTDOWN BIT(1)
+#define TAS27XX_PWR_CTRL TAS27XX_REG(0X0, 0x02)
+#define TAS27XX_PWR_CTRL_MASK GENMASK(1, 0)
+#define TAS27XX_PWR_CTRL_ACTIVE 0x0
+#define TAS27XX_PWR_CTRL_MUTE BIT(0)
+#define TAS27XX_PWR_CTRL_SHUTDOWN BIT(1)
-#define TAS2764_VSENSE_POWER_EN 3
-#define TAS2764_ISENSE_POWER_EN 4
+#define TAS27XX_VSENSE_POWER_EN 3
+#define TAS27XX_ISENSE_POWER_EN 4
/* Digital Volume Control */
-#define TAS2764_DVC TAS2764_REG(0X0, 0x1a)
-#define TAS2764_DVC_MAX 0xc9
+#define TAS27XX_DVC TAS27XX_REG(0X0, 0x1a)
+#define TAS27XX_DVC_MAX 0xc9
-#define TAS2764_CHNL_0 TAS2764_REG(0X0, 0x03)
+#define TAS27XX_CHNL_0 TAS27XX_REG(0X0, 0x03)
/* TDM Configuration Reg0 */
-#define TAS2764_TDM_CFG0 TAS2764_REG(0X0, 0x08)
-#define TAS2764_TDM_CFG0_SMP_MASK BIT(5)
-#define TAS2764_TDM_CFG0_SMP_48KHZ 0x0
-#define TAS2764_TDM_CFG0_SMP_44_1KHZ BIT(5)
-#define TAS2764_TDM_CFG0_MASK GENMASK(3, 1)
-#define TAS2764_TDM_CFG0_44_1_48KHZ BIT(3)
-#define TAS2764_TDM_CFG0_88_2_96KHZ (BIT(3) | BIT(1))
+#define TAS27XX_TDM_CFG0 TAS27XX_REG(0X0, 0x08)
+#define TAS27XX_TDM_CFG0_SMP_MASK BIT(5)
+#define TAS27XX_TDM_CFG0_SMP_48KHZ 0x0
+#define TAS27XX_TDM_CFG0_SMP_44_1KHZ BIT(5)
+#define TAS27XX_TDM_CFG0_MASK GENMASK(3, 1)
+#define TAS27XX_TDM_CFG0_44_1_48KHZ BIT(3)
+#define TAS27XX_TDM_CFG0_88_2_96KHZ (BIT(3) | BIT(1))
/* TDM Configuration Reg1 */
-#define TAS2764_TDM_CFG1 TAS2764_REG(0X0, 0x09)
-#define TAS2764_TDM_CFG1_MASK GENMASK(5, 1)
-#define TAS2764_TDM_CFG1_51_SHIFT 1
-#define TAS2764_TDM_CFG1_RX_MASK BIT(0)
-#define TAS2764_TDM_CFG1_RX_RISING 0x0
-#define TAS2764_TDM_CFG1_RX_FALLING BIT(0)
+#define TAS27XX_TDM_CFG1 TAS27XX_REG(0X0, 0x09)
+#define TAS27XX_TDM_CFG1_MASK GENMASK(5, 1)
+#define TAS27XX_TDM_CFG1_51_SHIFT 1
+#define TAS27XX_TDM_CFG1_RX_MASK BIT(0)
+#define TAS27XX_TDM_CFG1_RX_RISING 0x0
+#define TAS27XX_TDM_CFG1_RX_FALLING BIT(0)
/* TDM Configuration Reg2 */
-#define TAS2764_TDM_CFG2 TAS2764_REG(0X0, 0x0a)
-#define TAS2764_TDM_CFG2_RXW_MASK GENMASK(3, 2)
-#define TAS2764_TDM_CFG2_RXW_16BITS 0x0
-#define TAS2764_TDM_CFG2_RXW_24BITS BIT(3)
-#define TAS2764_TDM_CFG2_RXW_32BITS (BIT(3) | BIT(2))
-#define TAS2764_TDM_CFG2_RXS_MASK GENMASK(1, 0)
-#define TAS2764_TDM_CFG2_RXS_16BITS 0x0
-#define TAS2764_TDM_CFG2_RXS_24BITS BIT(0)
-#define TAS2764_TDM_CFG2_RXS_32BITS BIT(1)
-#define TAS2764_TDM_CFG2_SCFG_MASK GENMASK(5, 4)
-#define TAS2764_TDM_CFG2_SCFG_I2S 0x0
-#define TAS2764_TDM_CFG2_SCFG_LEFT_J BIT(4)
-#define TAS2764_TDM_CFG2_SCFG_RIGHT_J BIT(5)
+#define TAS27XX_TDM_CFG2 TAS27XX_REG(0X0, 0x0a)
+#define TAS27XX_TDM_CFG2_RXW_MASK GENMASK(3, 2)
+#define TAS27XX_TDM_CFG2_RXW_16BITS 0x0
+#define TAS27XX_TDM_CFG2_RXW_24BITS BIT(3)
+#define TAS27XX_TDM_CFG2_RXW_32BITS (BIT(3) | BIT(2))
+#define TAS27XX_TDM_CFG2_RXS_MASK GENMASK(1, 0)
+#define TAS27XX_TDM_CFG2_RXS_16BITS 0x0
+#define TAS27XX_TDM_CFG2_RXS_24BITS BIT(0)
+#define TAS27XX_TDM_CFG2_RXS_32BITS BIT(1)
+#define TAS27XX_TDM_CFG2_SCFG_MASK GENMASK(5, 4)
+#define TAS27XX_TDM_CFG2_SCFG_I2S 0x0
+#define TAS27XX_TDM_CFG2_SCFG_LEFT_J BIT(4)
+#define TAS27XX_TDM_CFG2_SCFG_RIGHT_J BIT(5)
/* TDM Configuration Reg3 */
-#define TAS2764_TDM_CFG3 TAS2764_REG(0X0, 0x0c)
-#define TAS2764_TDM_CFG3_RXS_MASK GENMASK(7, 4)
-#define TAS2764_TDM_CFG3_RXS_SHIFT 0x4
-#define TAS2764_TDM_CFG3_MASK GENMASK(3, 0)
+#define TAS27XX_TDM_CFG3 TAS27XX_REG(0X0, 0x0c)
+#define TAS27XX_TDM_CFG3_RXS_MASK GENMASK(7, 4)
+#define TAS27XX_TDM_CFG3_RXS_SHIFT 0x4
+#define TAS27XX_TDM_CFG3_MASK GENMASK(3, 0)
+
+/* TDM Configuration Reg4 */
+#define TAS27XX_TDM_CFG4 TAS27XX_REG(0X0, 0x0d)
+#define TAS27XX_TDM_CFG4_TX_OFFSET_MASK GENMASK(3, 1)
/* TDM Configuration Reg5 */
-#define TAS2764_TDM_CFG5 TAS2764_REG(0X0, 0x0e)
-#define TAS2764_TDM_CFG5_VSNS_MASK BIT(6)
-#define TAS2764_TDM_CFG5_VSNS_ENABLE BIT(6)
-#define TAS2764_TDM_CFG5_50_MASK GENMASK(5, 0)
+#define TAS27XX_TDM_CFG5 TAS27XX_REG(0X0, 0x0e)
+#define TAS27XX_TDM_CFG5_VSNS_MASK BIT(6)
+#define TAS27XX_TDM_CFG5_VSNS_ENABLE BIT(6)
+#define TAS27XX_TDM_CFG5_50_MASK GENMASK(5, 0)
/* TDM Configuration Reg6 */
-#define TAS2764_TDM_CFG6 TAS2764_REG(0X0, 0x0f)
-#define TAS2764_TDM_CFG6_ISNS_MASK BIT(6)
-#define TAS2764_TDM_CFG6_ISNS_ENABLE BIT(6)
-#define TAS2764_TDM_CFG6_50_MASK GENMASK(5, 0)
+#define TAS27XX_TDM_CFG6 TAS27XX_REG(0X0, 0x0f)
+#define TAS27XX_TDM_CFG6_ISNS_MASK BIT(6)
+#define TAS27XX_TDM_CFG6_ISNS_ENABLE BIT(6)
+#define TAS27XX_TDM_CFG6_50_MASK GENMASK(5, 0)
+
+/* INT&CLK CFG */
+#define TAS27XX_CLK_CFG TAS27XX_REG(0X0, 0x5c)
+#define TAS27XX_CLK_CFG_MASK GENMASK(7, 6)
+#define TAS27XX_CLK_CFG_ENABLE (BIT(7) | BIT(6))
-#endif /* __TAS2764__ */
+#endif /* __TAS27XX_H__ */
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v6 3/3] update to support either TAS2764 or TAS2780
2022-04-01 15:02 [PATCH v6 1/3] rename tas2764 to tas27xx Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 2/3] rename variables from " Raphael-Xu
@ 2022-04-01 15:03 ` Raphael-Xu
2022-04-05 9:44 ` Mark Brown
1 sibling, 1 reply; 5+ messages in thread
From: Raphael-Xu @ 2022-04-01 15:03 UTC (permalink / raw)
To: broonie; +Cc: navada, alsa-devel, shenghao-ding, raphael-xu, Raphael-Xu
fix no sound issue on some platforms
Signed-off-by: Raphael-Xu <13691752556@139.com>
---
sound/soc/codecs/tas27xx.c | 405 +++++++++++++++++++++++++++----------
sound/soc/codecs/tas27xx.h | 2 +-
2 files changed, 295 insertions(+), 112 deletions(-)
diff --git a/sound/soc/codecs/tas27xx.c b/sound/soc/codecs/tas27xx.c
index 8953516b55dc..fd8000f9526a 100644
--- a/sound/soc/codecs/tas27xx.c
+++ b/sound/soc/codecs/tas27xx.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-// Driver for the Texas Instruments TAS2764 Mono
+// Driver for the Texas Instruments TAS2764/TAS2780 Mono
// Audio amplifier
// Copyright (C) 2020-2022 Texas Instruments Inc.
@@ -12,11 +12,9 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
-#include <linux/regulator/consumer.h>
#include <linux/regmap.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
-#include <linux/slab.h>
#include <sound/soc.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -31,21 +29,25 @@ struct tas27xx_priv {
struct gpio_desc *sdz_gpio;
struct regmap *regmap;
struct device *dev;
-
+ struct mutex codec_lock;
int v_sense_slot;
int i_sense_slot;
+ int device_id;
+ bool mb_power_up;
};
enum tas27xx {
TAS2764 = 0,
+ TAS2780 = 1,
};
static void tas27xx_reset(struct tas27xx_priv *tas27xx)
{
if (tas27xx->reset_gpio) {
gpiod_set_value_cansleep(tas27xx->reset_gpio, 0);
- msleep(20);
+ usleep_range(2000, 2050);
gpiod_set_value_cansleep(tas27xx->reset_gpio, 1);
+ usleep_range(5000, 5050);
}
snd_soc_component_write(tas27xx->component, TAS27XX_SW_RST,
@@ -57,32 +59,52 @@ static int tas27xx_set_bias_level(struct snd_soc_component *component,
{
struct tas27xx_priv *tas27xx =
snd_soc_component_get_drvdata(component);
-
+ int ret = 0;
+
+ mutex_lock(&tas27xx->codec_lock);
switch (level) {
case SND_SOC_BIAS_ON:
- snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
- TAS27XX_PWR_CTRL_MASK,
- TAS27XX_PWR_CTRL_ACTIVE);
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_ACTIVE);
+ if (ret >= 0) {
+ tas27xx->mb_power_up = true;
+ ret = 0;
+ }
break;
case SND_SOC_BIAS_STANDBY:
case SND_SOC_BIAS_PREPARE:
- snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
- TAS27XX_PWR_CTRL_MASK,
- TAS27XX_PWR_CTRL_MUTE);
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_MUTE);
+ if (ret >= 0) {
+ tas27xx->mb_power_up = true;
+ ret = 0;
+ }
break;
case SND_SOC_BIAS_OFF:
- snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
- TAS27XX_PWR_CTRL_MASK,
- TAS27XX_PWR_CTRL_SHUTDOWN);
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_PWR_CTRL,
+ TAS27XX_PWR_CTRL_MASK,
+ TAS27XX_PWR_CTRL_SHUTDOWN);
+ if (ret >= 0) {
+ tas27xx->mb_power_up = false;
+ ret = 0;
+ }
break;
default:
dev_err(tas27xx->dev,
- "wrong power level setting %d\n", level);
- return -EINVAL;
+ "wrong power level setting %d\n", level);
+ ret = -EINVAL;
}
-
- return 0;
+ if (ret < 0)
+ pr_err("%s:%u:errCode:0x%0x:set BIAS error\n",
+ __func__, __LINE__, ret);
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
#ifdef CONFIG_PM
@@ -90,30 +112,37 @@ static int tas27xx_codec_suspend(struct snd_soc_component *component)
{
struct tas27xx_priv *tas27xx =
snd_soc_component_get_drvdata(component);
- int ret;
+ int ret = 0;
+ mutex_lock(&tas27xx->codec_lock);
ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
TAS27XX_PWR_CTRL_MASK,
TAS27XX_PWR_CTRL_SHUTDOWN);
- if (ret < 0)
- return ret;
-
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%0x:power down error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ ret = 0;
+ tas27xx->mb_power_up = false;
if (tas27xx->sdz_gpio)
gpiod_set_value_cansleep(tas27xx->sdz_gpio, 0);
regcache_cache_only(tas27xx->regmap, true);
regcache_mark_dirty(tas27xx->regmap);
-
- return 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static int tas27xx_codec_resume(struct snd_soc_component *component)
{
struct tas27xx_priv *tas27xx =
snd_soc_component_get_drvdata(component);
- int ret;
+ int ret = 0;
+ mutex_lock(&tas27xx->codec_lock);
if (tas27xx->sdz_gpio)
gpiod_set_value_cansleep(tas27xx->sdz_gpio, 1);
@@ -121,16 +150,19 @@ static int tas27xx_codec_resume(struct snd_soc_component *component)
TAS27XX_PWR_CTRL_MASK,
TAS27XX_PWR_CTRL_ACTIVE);
- if (ret < 0)
- return ret;
-
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%0x:power down error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ ret = 0;
+ tas27xx->mb_power_up = false;
regcache_cache_only(tas27xx->regmap, false);
-
- return regcache_sync(tas27xx->regmap);
+ ret = regcache_sync(tas27xx->regmap);
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
-#else
-#define tas27xx_codec_suspend NULL
-#define tas27xx_codec_resume NULL
#endif
static const char * const tas27xx_ASI1_src[] = {
@@ -150,8 +182,9 @@ static int tas27xx_dac_event(struct snd_soc_dapm_widget *w,
snd_soc_dapm_to_component(w->dapm);
struct tas27xx_priv *tas27xx =
snd_soc_component_get_drvdata(component);
- int ret;
+ int ret = 0;
+ mutex_lock(&tas27xx->codec_lock);
switch (event) {
case SND_SOC_DAPM_POST_PMU:
ret = snd_soc_component_update_bits(component,
@@ -167,13 +200,16 @@ static int tas27xx_dac_event(struct snd_soc_dapm_widget *w,
break;
default:
dev_err(tas27xx->dev, "Unsupported event\n");
- return -EINVAL;
+ ret = -EINVAL;
}
-
- if (ret < 0)
- return ret;
-
- return 0;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%0x:PWR_CTRL error\n",
+ __func__, __LINE__, ret);
+ } else {
+ ret = 0;
+ }
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static const struct snd_kcontrol_new isense_switch =
@@ -211,55 +247,106 @@ static const struct snd_soc_dapm_route tas27xx_audio_map[] = {
static int tas27xx_mute(struct snd_soc_dai *dai, int mute, int direction)
{
struct snd_soc_component *component = dai->component;
- int ret;
-
+ struct tas27xx_priv *tas27xx =
+ snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ mutex_lock(&tas27xx->codec_lock);
+
+ if (!mute) {
+ ret = snd_soc_component_read(component,
+ TAS27XX_CLK_CFG);
+ if (ret < 0) {
+ dev_err(tas27xx->dev,
+ "%s:%u:errCode:0x%x read "
+ "TAS27XX_CLK_CFG error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ if ((ret & TAS27XX_CLK_CFG_MASK) != TAS27XX_CLK_CFG_ENABLE) {
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_CLK_CFG,
+ TAS27XX_CLK_CFG_MASK,
+ TAS27XX_CLK_CFG_ENABLE);
+ if (ret < 0) {
+ dev_err(tas27xx->dev,
+ "%s:%u: Failed to CLK_CFG_ENABLE\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
+ usleep_range(3000, 3050);
+ }
+ }
ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
- TAS27XX_PWR_CTRL_MASK,
- mute ? TAS27XX_PWR_CTRL_MUTE : 0);
-
- if (ret < 0)
- return ret;
+ TAS27XX_PWR_CTRL_MASK,
+ mute ? TAS27XX_PWR_CTRL_MUTE : 0);
+ if (ret >= 0) {
+ tas27xx->mb_power_up = mute?false:true;
+ ret = 0;
+ } else {
+ pr_err("%s:%u: Failed to set powercontrol\n",
+ __func__, __LINE__);
+ }
- return 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static int tas27xx_set_bitwidth(struct tas27xx_priv *tas27xx, int bitwidth)
{
struct snd_soc_component *component = tas27xx->component;
- int sense_en;
- int val;
- int ret;
+ int sense_en, val, ret, slot_size;
+ mutex_lock(&tas27xx->codec_lock);
switch (bitwidth) {
case SNDRV_PCM_FORMAT_S16_LE:
ret = snd_soc_component_update_bits(component,
- TAS27XX_TDM_CFG2,
- TAS27XX_TDM_CFG2_RXW_MASK,
- TAS27XX_TDM_CFG2_RXW_16BITS);
+ TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXW_MASK,
+ TAS27XX_TDM_CFG2_RXW_16BITS);
+ slot_size = TAS27XX_TDM_CFG2_RXS_16BITS;
break;
case SNDRV_PCM_FORMAT_S24_LE:
ret = snd_soc_component_update_bits(component,
TAS27XX_TDM_CFG2,
TAS27XX_TDM_CFG2_RXW_MASK,
TAS27XX_TDM_CFG2_RXW_24BITS);
+ slot_size = TAS27XX_TDM_CFG2_RXS_24BITS;
break;
case SNDRV_PCM_FORMAT_S32_LE:
ret = snd_soc_component_update_bits(component,
TAS27XX_TDM_CFG2,
TAS27XX_TDM_CFG2_RXW_MASK,
TAS27XX_TDM_CFG2_RXW_32BITS);
+ slot_size = TAS27XX_TDM_CFG2_RXS_32BITS;
break;
default:
- return -EINVAL;
+ ret = -EINVAL;
}
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x set bitwidth error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG2,
+ TAS27XX_TDM_CFG2_RXS_MASK, slot_size);
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x set RX slot size error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
val = snd_soc_component_read(tas27xx->component, TAS27XX_PWR_CTRL);
- if (val < 0)
- return val;
+ if (val < 0) {
+ pr_err("%s:%u:errCode:0x%x read PWR_CTRL error\n",
+ __func__, __LINE__, val);
+ ret = val;
+ goto EXIT;
+ }
if (val & (1 << TAS27XX_VSENSE_POWER_EN))
sense_en = 0;
@@ -268,8 +355,11 @@ static int tas27xx_set_bitwidth(struct tas27xx_priv *tas27xx, int bitwidth)
ret = snd_soc_component_update_bits(tas27xx->component,
TAS27XX_TDM_CFG5, TAS27XX_TDM_CFG5_VSNS_ENABLE, sense_en);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x enable vSNS error\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
if (val & (1 << TAS27XX_ISENSE_POWER_EN))
sense_en = 0;
@@ -278,10 +368,14 @@ static int tas27xx_set_bitwidth(struct tas27xx_priv *tas27xx, int bitwidth)
ret = snd_soc_component_update_bits(tas27xx->component,
TAS27XX_TDM_CFG6, TAS27XX_TDM_CFG6_ISNS_ENABLE, sense_en);
- if (ret < 0)
- return ret;
-
- return 0;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x enable iSNS error\n",
+ __func__, __LINE__, ret);
+ }
+ ret = 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static int tas27xx_set_samplerate(
@@ -311,15 +405,20 @@ static int tas27xx_set_samplerate(
default:
return -EINVAL;
}
-
+ mutex_lock(&tas27xx->codec_lock);
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG0,
TAS27XX_TDM_CFG0_SMP_MASK |
TAS27XX_TDM_CFG0_MASK,
ramp_rate_val);
- if (ret < 0)
- return ret;
-
- return 0;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set ramp_rate_val\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ ret = 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static int tas27xx_hw_params(struct snd_pcm_substream *substream,
@@ -345,7 +444,7 @@ static int tas27xx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
snd_soc_component_get_drvdata(component);
u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0;
int iface;
- int ret;
+ int ret = 0;
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_NB_NF:
@@ -358,12 +457,15 @@ static int tas27xx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
dev_err(tas27xx->dev, "ASI format Inverse is not found\n");
return -EINVAL;
}
-
+ mutex_lock(&tas27xx->codec_lock);
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG1,
TAS27XX_TDM_CFG1_RX_MASK,
asi_cfg_1);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set asi_cfg_1\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
@@ -377,23 +479,32 @@ static int tas27xx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
tdm_rx_start_slot = 0;
break;
default:
- dev_err(tas27xx->dev,
- "DAI Format is not found, fmt=0x%x\n", fmt);
- return -EINVAL;
+ pr_err("%s:%u:DAI Format is not found, fmt=0x%x\n",
+ __func__, __LINE__, fmt);
+ ret = -EINVAL;
+ goto EXIT;
}
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG1,
TAS27XX_TDM_CFG1_MASK,
(tdm_rx_start_slot << TAS27XX_TDM_CFG1_51_SHIFT));
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set tdm_rx_start_slot\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG2,
TAS27XX_TDM_CFG2_SCFG_MASK, iface);
- if (ret < 0)
- return ret;
-
- return 0;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set iface\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ ret = 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static int tas27xx_set_dai_tdm_slot(struct snd_soc_dai *dai,
@@ -407,7 +518,7 @@ static int tas27xx_set_dai_tdm_slot(struct snd_soc_dai *dai,
int left_slot, right_slot;
int slots_cfg;
int slot_size;
- int ret;
+ int ret = 0;
if (tx_mask == 0 || rx_mask != 0)
return -EINVAL;
@@ -432,10 +543,13 @@ static int tas27xx_set_dai_tdm_slot(struct snd_soc_dai *dai,
return -EINVAL;
slots_cfg = (right_slot << TAS27XX_TDM_CFG3_RXS_SHIFT) | left_slot;
-
+ mutex_lock(&tas27xx->codec_lock);
ret = snd_soc_component_write(component, TAS27XX_TDM_CFG3, slots_cfg);
- if (ret)
- return ret;
+ if (ret) {
+ pr_err("%s:%u:errCode:0x%x Failed to set slots_cfg\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
switch (slot_width) {
case 16:
@@ -448,28 +562,40 @@ static int tas27xx_set_dai_tdm_slot(struct snd_soc_dai *dai,
slot_size = TAS27XX_TDM_CFG2_RXS_32BITS;
break;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ goto EXIT;
}
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG2,
TAS27XX_TDM_CFG2_RXS_MASK,
slot_size);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set slot_size\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG5,
TAS27XX_TDM_CFG5_50_MASK,
tas27xx->v_sense_slot);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set v_sense_slot\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG6,
TAS27XX_TDM_CFG6_50_MASK,
tas27xx->i_sense_slot);
- if (ret < 0)
- return ret;
-
- return 0;
+ if (ret < 0) {
+ pr_err("%s:%u:errCode:0x%x Failed to set i_sense_slot\n",
+ __func__, __LINE__, ret);
+ goto EXIT;
+ }
+ ret = 0;
+EXIT:
+ mutex_unlock(&tas27xx->codec_lock);
+ return ret;
}
static const struct snd_soc_dai_ops tas27xx_dai_ops = {
@@ -499,7 +625,7 @@ static struct snd_soc_dai_driver tas27xx_dai_driver[] = {
},
.capture = {
.stream_name = "ASI1 Capture",
- .channels_min = 0,
+ .channels_min = 1,
.channels_max = 2,
.rates = TAS27XX_RATES,
.formats = TAS27XX_FORMATS,
@@ -513,7 +639,7 @@ static int tas27xx_codec_probe(struct snd_soc_component *component)
{
struct tas27xx_priv *tas27xx =
snd_soc_component_get_drvdata(component);
- int ret;
+ int ret = 0;
tas27xx->component = component;
@@ -521,26 +647,54 @@ static int tas27xx_codec_probe(struct snd_soc_component *component)
gpiod_set_value_cansleep(tas27xx->sdz_gpio, 1);
tas27xx_reset(tas27xx);
+ usleep_range(5000, 5050);
- ret = snd_soc_component_update_bits(tas27xx->component,
- TAS27XX_TDM_CFG5,
+ ret = snd_soc_component_update_bits(component,
+ TAS27XX_CLK_CFG,
+ TAS27XX_CLK_CFG_MASK,
+ TAS27XX_CLK_CFG_ENABLE);
+ if (ret < 0) {
+ dev_err(tas27xx->dev,
+ "%s:%u: Failed to CLK_CFG_ENABLE\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
+
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG5,
TAS27XX_TDM_CFG5_VSNS_ENABLE, 0);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ dev_err(tas27xx->dev, "%s:%u: Failed to enable vSNS\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
- ret = snd_soc_component_update_bits(tas27xx->component,
- TAS27XX_TDM_CFG6,
+ ret = snd_soc_component_update_bits(component, TAS27XX_TDM_CFG6,
TAS27XX_TDM_CFG6_ISNS_ENABLE, 0);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ dev_err(tas27xx->dev, "%s:%u: Failed to enable iSNS\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
ret = snd_soc_component_update_bits(component, TAS27XX_PWR_CTRL,
TAS27XX_PWR_CTRL_MASK,
TAS27XX_PWR_CTRL_MUTE);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ dev_err(tas27xx->dev, "%s:%u: Failed to PWR_CTRL_MUTE\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
- return 0;
+ ret = snd_soc_component_write(component, TAS27XX_PWR_CTRL, 0x02);
+
+ if (ret < 0) {
+ dev_err(tas27xx->dev, "%s:%u: Failed to initial active\n",
+ __func__, __LINE__);
+ goto EXIT;
+ }
+ ret = 0;
+EXIT:
+ return ret;
}
static DECLARE_TLV_DB_SCALE(tas27xx_digital_tlv, 1100, 50, 0);
@@ -555,8 +709,10 @@ static const struct snd_kcontrol_new tas27xx_snd_controls[] = {
static const struct snd_soc_component_driver soc_component_driver_tas27xx = {
.probe = tas27xx_codec_probe,
+#ifdef CONFIG_PM
.suspend = tas27xx_codec_suspend,
.resume = tas27xx_codec_resume,
+#endif
.set_bias_level = tas27xx_set_bias_level,
.controls = tas27xx_snd_controls,
.num_controls = ARRAY_SIZE(tas27xx_snd_controls),
@@ -594,6 +750,27 @@ static const struct regmap_range_cfg tas27xx_regmap_ranges[] = {
},
};
+static bool tas27xx_volatile(struct device *dev,
+ unsigned int reg)
+{
+ switch (reg) {
+ case TAS27XX_SW_RST:
+ case TAS27XX_PWR_CTRL:
+ case TAS27XX_PAGE:
+ case TAS27XX_DVC:
+ case TAS27XX_CHNL_0:
+ case TAS27XX_TDM_CFG0:
+ case TAS27XX_TDM_CFG1:
+ case TAS27XX_TDM_CFG2:
+ case TAS27XX_TDM_CFG3:
+ case TAS27XX_TDM_CFG5:
+ case TAS27XX_TDM_CFG6:
+ return true;
+ default:
+ return false;
+ }
+}
+
static const struct regmap_config tas27xx_i2c_regmap = {
.reg_bits = 8,
.val_bits = 8,
@@ -603,6 +780,7 @@ static const struct regmap_config tas27xx_i2c_regmap = {
.ranges = tas27xx_regmap_ranges,
.num_ranges = ARRAY_SIZE(tas27xx_regmap_ranges),
.max_register = 1 * 128,
+ .volatile_reg = tas27xx_volatile,
};
static int tas27xx_parse_dt(struct device *dev, struct tas27xx_priv *tas27xx)
@@ -650,7 +828,7 @@ static int tas27xx_i2c_probe(struct i2c_client *client,
GFP_KERNEL);
if (!tas27xx)
return -ENOMEM;
-
+ mutex_init(&tas27xx->codec_lock);
tas27xx->dev = &client->dev;
i2c_set_clientdata(client, tas27xx);
dev_set_drvdata(&client->dev, tas27xx);
@@ -672,6 +850,9 @@ static int tas27xx_i2c_probe(struct i2c_client *client,
}
}
+ tas27xx->device_id = id->driver_data;
+ dev_info(tas27xx->dev, "chip_id: %u\n", tas27xx->device_id);
+
return devm_snd_soc_register_component(tas27xx->dev,
&soc_component_driver_tas27xx, tas27xx_dai_driver,
ARRAY_SIZE(tas27xx_dai_driver));
@@ -679,6 +860,7 @@ static int tas27xx_i2c_probe(struct i2c_client *client,
static const struct i2c_device_id tas27xx_i2c_id[] = {
{ "tas2764", TAS2764},
+ { "tas2780", TAS2780},
{ }
};
MODULE_DEVICE_TABLE(i2c, tas27xx_i2c_id);
@@ -686,6 +868,7 @@ MODULE_DEVICE_TABLE(i2c, tas27xx_i2c_id);
#if defined(CONFIG_OF)
static const struct of_device_id tas27xx_of_match[] = {
{ .compatible = "ti,tas2764" },
+ { .compatible = "ti,tas2780" },
{},
};
MODULE_DEVICE_TABLE(of, tas27xx_of_match);
diff --git a/sound/soc/codecs/tas27xx.h b/sound/soc/codecs/tas27xx.h
index 6f76645f5cd6..95923e437a38 100644
--- a/sound/soc/codecs/tas27xx.h
+++ b/sound/soc/codecs/tas27xx.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * tas27xx.h - ALSA SoC Texas Instruments TAS2764 Mono Audio Amplifier
+ * tas27xx.h - ALSA SoC Texas Instruments TAS2764/TAS2780 Mono Audio Amplifier
*
* Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com
*
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v6 3/3] update to support either TAS2764 or TAS2780
2022-04-01 15:03 ` [PATCH v6 3/3] update to support either TAS2764 or TAS2780 Raphael-Xu
@ 2022-04-05 9:44 ` Mark Brown
2022-04-09 12:32 ` [EXTERNAL] " Xu, Yang
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2022-04-05 9:44 UTC (permalink / raw)
To: Raphael-Xu; +Cc: alsa-devel, raphael-xu, shenghao-ding, navada
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
On Fri, Apr 01, 2022 at 11:03:01PM +0800, Raphael-Xu wrote:
> fix no sound issue on some platforms
>
> Signed-off-by: Raphael-Xu <13691752556@139.com>
> ---
> sound/soc/codecs/tas27xx.c | 405 +++++++++++++++++++++++++++----------
> sound/soc/codecs/tas27xx.h | 2 +-
> 2 files changed, 295 insertions(+), 112 deletions(-)
This doesn't apply against current code (with your first two patches
applied), please check and resend - should just be a rebase.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] Re: [PATCH v6 3/3] update to support either TAS2764 or TAS2780
2022-04-05 9:44 ` Mark Brown
@ 2022-04-09 12:32 ` Xu, Yang
0 siblings, 0 replies; 5+ messages in thread
From: Xu, Yang @ 2022-04-09 12:32 UTC (permalink / raw)
To: Mark Brown; +Cc: Ding, Shenghao, alsa-devel, Raphael-Xu, Navada Kanyana, Mukund
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
在 2022年4月5日，下午5:44，Mark Brown <broonie@kernel.org> 写道：
On Fri, Apr 01, 2022 at 11:03:01PM +0800, Raphael-Xu wrote:
fix no sound issue on some platforms
Signed-off-by: Raphael-Xu <13691752556@139.com>
---
sound/soc/codecs/tas27xx.c | 405 +++++++++++++++++++++++++++----------
sound/soc/codecs/tas27xx.h | 2 +-
2 files changed, 295 insertions(+), 112 deletions(-)
This doesn't apply against current code (with your first two patches
applied), please check and resend - should just be a rebase.
Just resubmit the patches which base on the latest kernel origin/master today.
[-- Attachment #2: signature.asc --]
[-- Type: application/octet-stream, Size: 499 bytes --]
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmJMD2QACgkQJNaLcl1U
h9CSpggAgLA3V+y06zBInxSiJxnjfcOuIgekvMJMgrtmKAnBVhHyWEV485wGOzCk
329+VccVHhChKYvqNu/m/Ar/tls4n05voxQVMTjJofMIjxRlTGw1rN7Q2dIAOifa
k0YI1/DObYX6+h0QR5CvpWfxTZftRSpUswv4r0yi3BhfL2dl0LS2KEVeLZ9JND9V
A/D7uyVnM8U3Cm5dV/OsRCPO/RQNZ3kaCSCaYx8e/EbD+1n8DQVC6fT+AigOQiNS
su5m7Kw9OLNO5JvN8qy/r0mlmJnYfunnSI7GsFL7qF8oNFSOG2/mjS7Qk2ieOOuX
uaSWdZON9VipbHSGO7/lsHXj7X7W6w==
=BAbP
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-09 12:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01 15:02 [PATCH v6 1/3] rename tas2764 to tas27xx Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 2/3] rename variables from " Raphael-Xu
2022-04-01 15:03 ` [PATCH v6 3/3] update to support either TAS2764 or TAS2780 Raphael-Xu
2022-04-05 9:44 ` Mark Brown
2022-04-09 12:32 ` [EXTERNAL] " Xu, Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.