Skip to content

Commit e8dce61

Browse files
committed
ASoC: cs47l96: Remove FRF filter from Castillo
The FRF filter was only used in some narrow customer circumstances and will be moved on new CODECs. Remove this feature from Castillo. Change-Id: Id53bb89c0e0c320fb23e9be5cce53801c5fcce60 Signed-off-by: Charles Keepax <[email protected]>
1 parent 8906fd2 commit e8dce61

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed

sound/soc/codecs/cs47l96.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -672,11 +672,6 @@ SOC_SINGLE_EXT_TLV("IN4R Digital Volume", TACNA_IN4R_CONTROL2,
672672
SOC_ENUM("Input Ramp Up", tacna_in_vi_ramp),
673673
SOC_ENUM("Input Ramp Down", tacna_in_vd_ramp),
674674

675-
TACNA_FRF_BYTES("FRF COEFF 1L", TACNA_FRF_COEFF_1L_1, TACNA_FRF_COEFF_LEN),
676-
TACNA_FRF_BYTES("FRF COEFF 1R", TACNA_FRF_COEFF_1R_1, TACNA_FRF_COEFF_LEN),
677-
TACNA_FRF_BYTES("FRF COEFF 5L", TACNA_FRF_COEFF_5L_1, TACNA_FRF_COEFF_LEN),
678-
TACNA_FRF_BYTES("FRF COEFF 5R", TACNA_FRF_COEFF_5R_1, TACNA_FRF_COEFF_LEN),
679-
680675
TACNA_MIXER_CONTROLS("EQ1", TACNA_EQ1_INPUT1),
681676
TACNA_MIXER_CONTROLS("EQ2", TACNA_EQ2_INPUT1),
682677
TACNA_MIXER_CONTROLS("EQ3", TACNA_EQ3_INPUT1),

sound/soc/codecs/tacna.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,30 +1235,6 @@ const struct soc_enum tacna_output_anc_src[] = {
12351235
};
12361236
EXPORT_SYMBOL_GPL(tacna_output_anc_src);
12371237

1238-
int tacna_frf_bytes_put(struct snd_kcontrol *kcontrol,
1239-
struct snd_ctl_elem_value *ucontrol)
1240-
{
1241-
struct soc_bytes *params = (void *)kcontrol->private_value;
1242-
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1243-
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
1244-
struct tacna_priv *priv = snd_soc_codec_get_drvdata(codec);
1245-
struct tacna *tacna = priv->tacna;
1246-
int ret, len;
1247-
void *data;
1248-
1249-
len = params->num_regs * component->val_bytes;
1250-
1251-
data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA);
1252-
if (!data)
1253-
return -ENOMEM;
1254-
1255-
ret = regmap_raw_write(tacna->regmap, params->base, data, len);
1256-
1257-
kfree(data);
1258-
return ret;
1259-
}
1260-
EXPORT_SYMBOL_GPL(tacna_frf_bytes_put);
1261-
12621238
const struct soc_enum tacna_asrc1_rate[] = {
12631239
SOC_VALUE_ENUM_SINGLE(TACNA_ASRC1_CONTROL1,
12641240
TACNA_ASRC1_RATE1_SHIFT,

sound/soc/codecs/tacna.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@
110110

111111
#define TACNA_NUM_MIXER_INPUTS 139
112112

113-
#define TACNA_FRF_COEFF_LEN 2
114-
115113
#define TACNA_EQ_BLOCK_SZ 60
116114
#define TACNA_N_EQ_BLOCKS 4
117115

@@ -281,13 +279,6 @@
281279
((unsigned long)&(struct soc_bytes) { .base = xbase, \
282280
.num_regs = 1 }) }
283281

284-
#define TACNA_FRF_BYTES(xname, xbase, xregs) \
285-
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
286-
.info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \
287-
.put = tacna_frf_bytes_put, .private_value = \
288-
((unsigned long)&(struct soc_bytes) {.base = xbase, \
289-
.num_regs = xregs }) }
290-
291282
/* these have a subseq number so they run after SYSCLK and DSPCLK widgets */
292283
#define TACNA_DSP_FREQ_WIDGET_EV(name, num, event) \
293284
SND_SOC_DAPM_SUPPLY_S(name "FREQ", 100, SND_SOC_NOPM, num, 0, \
@@ -478,9 +469,6 @@ extern const struct soc_enum tacna_mono_anc_input_src[];
478469
extern const struct soc_enum tacna_anc_ng_enum;
479470
extern const struct soc_enum tacna_output_anc_src[];
480471

481-
int tacna_frf_bytes_put(struct snd_kcontrol *kcontrol,
482-
struct snd_ctl_elem_value *ucontrol);
483-
484472
extern const struct soc_enum tacna_asrc1_rate[];
485473
extern const struct soc_enum tacna_asrc2_rate[];
486474

0 commit comments

Comments
 (0)