Skip to content

Commit 0fabbe7

Browse files
bardliaobardliao
committed
Merge remote-tracking branch 'takashi/for-next' into sound/upstream-20250514
2 parents 63112e3 + eef5bcc commit 0fabbe7

115 files changed

Lines changed: 1636 additions & 4621 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5654,7 +5654,6 @@ F: include/sound/cs*
56545654
F: sound/pci/hda/cirrus*
56555655
F: sound/pci/hda/cs*
56565656
F: sound/pci/hda/hda_component*
5657-
F: sound/pci/hda/hda_cs_dsp_ctl.*
56585657
F: sound/soc/codecs/cs*
56595658

56605659
CIRRUS LOGIC HAPTIC DRIVERS

‎include/sound/core.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ void snd_device_disconnect(struct snd_card *card, void *device_data);
326326
void snd_device_disconnect_all(struct snd_card *card);
327327
void snd_device_free(struct snd_card *card, void *device_data);
328328
void snd_device_free_all(struct snd_card *card);
329-
int snd_device_get_state(struct snd_card *card, void *device_data);
330329

331330
/* isadma.c */
332331

‎include/sound/dmaengine_pcm.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
3838
int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream);
3939
int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream);
4040

41-
int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,
42-
dma_filter_fn filter_fn, void *filter_data);
4341
int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream);
4442

4543
struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn,

‎include/sound/gus.h‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -513,22 +513,6 @@ struct _SND_IW_LFO_PROGRAM {
513513
unsigned short depth;
514514
};
515515

516-
#if 0
517-
extern irqreturn_t snd_gf1_lfo_effect_interrupt(struct snd_gus_card * gus, snd_gf1_voice_t * voice);
518-
#endif
519-
extern void snd_gf1_lfo_init(struct snd_gus_card * gus);
520-
extern void snd_gf1_lfo_done(struct snd_gus_card * gus);
521-
extern void snd_gf1_lfo_program(struct snd_gus_card * gus, int voice, int lfo_type, struct _SND_IW_LFO_PROGRAM *program);
522-
extern void snd_gf1_lfo_enable(struct snd_gus_card * gus, int voice, int lfo_type);
523-
extern void snd_gf1_lfo_disable(struct snd_gus_card * gus, int voice, int lfo_type);
524-
extern void snd_gf1_lfo_change_freq(struct snd_gus_card * gus, int voice, int lfo_type, int freq);
525-
extern void snd_gf1_lfo_change_depth(struct snd_gus_card * gus, int voice, int lfo_type, int depth);
526-
extern void snd_gf1_lfo_setup(struct snd_gus_card * gus, int voice, int lfo_type, int freq, int current_depth, int depth, int sweep, int shape);
527-
extern void snd_gf1_lfo_shutdown(struct snd_gus_card * gus, int voice, int lfo_type);
528-
#if 0
529-
extern void snd_gf1_lfo_command(struct snd_gus_card * gus, int voice, unsigned char *command);
530-
#endif
531-
532516
/* gus_mem.c */
533517

534518
void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup);
@@ -578,14 +562,8 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus);
578562

579563
int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index);
580564

581-
#ifdef CONFIG_SND_DEBUG
582-
extern void snd_gf1_print_voice_registers(struct snd_gus_card * gus);
583-
#endif
584-
585565
/* gus.c */
586566

587-
int snd_gus_use_inc(struct snd_gus_card * gus);
588-
void snd_gus_use_dec(struct snd_gus_card * gus);
589567
int snd_gus_create(struct snd_card *card,
590568
unsigned long port,
591569
int irq, int dma1, int dma2,

‎include/sound/hdaudio.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,6 @@ void snd_hdac_stream_spbcap_enable(struct hdac_bus *chip,
598598
bool enable, int index);
599599
int snd_hdac_stream_set_spib(struct hdac_bus *bus,
600600
struct hdac_stream *azx_dev, u32 value);
601-
int snd_hdac_stream_get_spbmaxfifo(struct hdac_bus *bus,
602-
struct hdac_stream *azx_dev);
603601
void snd_hdac_stream_drsm_enable(struct hdac_bus *bus,
604602
bool enable, int index);
605603
int snd_hdac_stream_wait_drsm(struct hdac_stream *azx_dev);

‎include/sound/jack.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
7979
struct snd_jack **jack, bool initial_kctl, bool phantom_jack);
8080
int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);
8181
#ifdef CONFIG_SND_JACK_INPUT_DEV
82-
void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
8382
int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
8483
int keytype);
8584
#endif
@@ -104,11 +103,6 @@ static inline void snd_jack_report(struct snd_jack *jack, int status)
104103
#endif
105104

106105
#if !defined(CONFIG_SND_JACK) || !defined(CONFIG_SND_JACK_INPUT_DEV)
107-
static inline void snd_jack_set_parent(struct snd_jack *jack,
108-
struct device *parent)
109-
{
110-
}
111-
112106
static inline int snd_jack_set_key(struct snd_jack *jack,
113107
enum snd_jack_types type,
114108
int keytype)

‎include/sound/pcm.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,6 @@ unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
12511251
unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);
12521252
unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,
12531253
unsigned int rates_b);
1254-
unsigned int snd_pcm_rate_range_to_bits(unsigned int rate_min,
1255-
unsigned int rate_max);
12561254

12571255
/**
12581256
* snd_pcm_set_runtime_buffer - Set the PCM runtime buffer

‎include/sound/snd_wavefront.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,8 @@ struct _snd_wavefront_card {
110110
};
111111

112112
extern void snd_wavefront_internal_interrupt (snd_wavefront_card_t *card);
113-
extern int snd_wavefront_detect_irq (snd_wavefront_t *dev) ;
114-
extern int snd_wavefront_check_irq (snd_wavefront_t *dev, int irq);
115-
extern int snd_wavefront_restart (snd_wavefront_t *dev);
116113
extern int snd_wavefront_start (snd_wavefront_t *dev);
117114
extern int snd_wavefront_detect (snd_wavefront_card_t *card);
118-
extern int snd_wavefront_config_midi (snd_wavefront_t *dev) ;
119115
extern int snd_wavefront_cmd (snd_wavefront_t *, int, unsigned char *,
120116
unsigned char *);
121117

‎include/sound/tas2781-comlib-i2c.h‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
//
3+
// ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier
4+
//
5+
// Copyright (C) 2025 Texas Instruments Incorporated
6+
// https://www.ti.com
7+
//
8+
// The TAS2563/TAS2781 driver implements a flexible and configurable
9+
// algo coefficient setting for one, two, or even multiple
10+
// TAS2563/TAS2781 chips.
11+
//
12+
// Author: Shenghao Ding <shenghao-ding@ti.com>
13+
//
14+
15+
#ifndef __TAS2781_COMLIB_I2C_H__
16+
#define __TAS2781_COMLIB_I2C_H__
17+
18+
void tasdevice_reset(struct tasdevice_priv *tas_dev);
19+
int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
20+
struct module *module,
21+
void (*cont)(const struct firmware *fw, void *context));
22+
struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c);
23+
int tasdevice_init(struct tasdevice_priv *tas_priv);
24+
int tasdev_chn_switch(struct tasdevice_priv *tas_priv,
25+
unsigned short chn);
26+
int tasdevice_dev_update_bits(
27+
struct tasdevice_priv *tasdevice, unsigned short chn,
28+
unsigned int reg, unsigned int mask, unsigned int value);
29+
int tasdevice_amp_putvol(struct tasdevice_priv *tas_priv,
30+
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
31+
int tasdevice_amp_getvol(struct tasdevice_priv *tas_priv,
32+
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
33+
int tasdevice_digital_getvol(struct tasdevice_priv *tas_priv,
34+
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
35+
int tasdevice_digital_putvol(struct tasdevice_priv *tas_priv,
36+
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
37+
#endif /* __TAS2781_COMLIB_I2C_H__ */

‎include/sound/tas2781.h‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
SNDRV_PCM_FMTBIT_S24_LE | \
3333
SNDRV_PCM_FMTBIT_S32_LE)
3434

35+
#define TASDEVICE_CRC8_POLYNOMIAL 0x4d
36+
3537
/* PAGE Control Register (available in page0 of each book) */
3638
#define TASDEVICE_PAGE_SELECT 0x00
3739
#define TASDEVICE_BOOKCTL_PAGE 0x00
@@ -216,6 +218,7 @@ struct tasdevice_priv {
216218
bool force_fwload_status;
217219
bool playback_started;
218220
bool isacpi;
221+
bool isspi;
219222
bool is_user_space_calidata;
220223
unsigned int global_addr;
221224

@@ -233,41 +236,31 @@ struct tasdevice_priv {
233236
int (*tasdevice_load_block)(struct tasdevice_priv *tas_priv,
234237
struct tasdev_blk *block);
235238

239+
int (*change_chn_book)(struct tasdevice_priv *tas_priv,
240+
unsigned short chn, int book);
241+
int (*update_bits)(struct tasdevice_priv *tas_priv,
242+
unsigned short chn, unsigned int reg, unsigned int mask,
243+
unsigned int value);
244+
int (*dev_read)(struct tasdevice_priv *tas_priv,
245+
unsigned short chn, unsigned int reg, unsigned int *value);
246+
int (*dev_bulk_read)(struct tasdevice_priv *tas_priv,
247+
unsigned short chn, unsigned int reg, unsigned char *p_data,
248+
unsigned int n_length);
236249
int (*save_calibration)(struct tasdevice_priv *tas_priv);
237250
void (*apply_calibration)(struct tasdevice_priv *tas_priv);
238251
};
239252

240-
void tasdevice_reset(struct tasdevice_priv *tas_dev);
241-
int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
242-
struct module *module,
243-
void (*cont)(const struct firmware *fw, void *context));
244-
struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c);
245-
int tasdevice_init(struct tasdevice_priv *tas_priv);
246-
void tasdevice_remove(struct tasdevice_priv *tas_priv);
247-
int tasdevice_save_calibration(struct tasdevice_priv *tas_priv);
248-
void tasdevice_apply_calibration(struct tasdevice_priv *tas_priv);
249-
int tasdev_chn_switch(struct tasdevice_priv *tas_priv,
250-
unsigned short chn);
251253
int tasdevice_dev_read(struct tasdevice_priv *tas_priv,
252254
unsigned short chn, unsigned int reg, unsigned int *value);
255+
int tasdevice_dev_bulk_read(struct tasdevice_priv *tas_priv,
256+
unsigned short chn, unsigned int reg, unsigned char *p_data,
257+
unsigned int n_length);
253258
int tasdevice_dev_write(struct tasdevice_priv *tas_priv,
254259
unsigned short chn, unsigned int reg, unsigned int value);
255260
int tasdevice_dev_bulk_write(
256261
struct tasdevice_priv *tas_priv, unsigned short chn,
257262
unsigned int reg, unsigned char *p_data, unsigned int n_length);
258-
int tasdevice_dev_bulk_read(struct tasdevice_priv *tas_priv,
259-
unsigned short chn, unsigned int reg, unsigned char *p_data,
260-
unsigned int n_length);
261-
int tasdevice_dev_update_bits(
262-
struct tasdevice_priv *tasdevice, unsigned short chn,
263-
unsigned int reg, unsigned int mask, unsigned int value);
264-
int tasdevice_amp_putvol(struct tasdevice_priv *tas_priv,
265-
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
266-
int tasdevice_amp_getvol(struct tasdevice_priv *tas_priv,
267-
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
268-
int tasdevice_digital_putvol(struct tasdevice_priv *tas_priv,
269-
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
270-
int tasdevice_digital_getvol(struct tasdevice_priv *tas_priv,
271-
struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc);
272-
263+
void tasdevice_remove(struct tasdevice_priv *tas_priv);
264+
int tasdevice_save_calibration(struct tasdevice_priv *tas_priv);
265+
void tasdevice_apply_calibration(struct tasdevice_priv *tas_priv);
273266
#endif /* __TAS2781_H__ */

0 commit comments

Comments
 (0)