Commit 821e2ac6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus 



Prepare for 6.8 merge.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents b6ce6e6c f90dffdc

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -8272,11 +8272,14 @@ L: linux-input@vger.kernel.org 
S:	Maintained

F:	drivers/input/joystick/fsia6b.c









FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER









FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett)









M:	Geoffrey D. Bennett <g@b4.vu>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git









W:	https://github.com/geoffreybennett/scarlett-gen2









B:	https://github.com/geoffreybennett/scarlett-gen2/issues









T:	git https://github.com/geoffreybennett/scarlett-gen2.git









F:	include/uapi/sound/scarlett2.h









F:	sound/usb/mixer_scarlett2.c

















FORCEDETH GIGABIT ETHERNET DRIVER
































include/linux/pci_ids.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -3065,6 +3065,7 @@







#define PCI_DEVICE_ID_INTEL_82443GX_0	0x71a0









#define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2









#define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601









#define PCI_DEVICE_ID_INTEL_HDA_ARL	0x7728









#define PCI_DEVICE_ID_INTEL_HDA_RPL_S	0x7a50









#define PCI_DEVICE_ID_INTEL_HDA_ADL_S	0x7ad0









#define PCI_DEVICE_ID_INTEL_HDA_MTL	0x7e28
































include/sound/ac97_codec.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -410,7 +410,7 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm);







int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime);



















/* ad hoc AC97 device driver access */









extern struct bus_type ac97_bus_type;









extern const struct bus_type ac97_bus_type;



















/* AC97 platform_data adding function */









static inline void snd_ac97_dev_add_pdata(struct snd_ac97 *ac97, void *data)
































include/sound/hda_codec.h



+3
−2






























Original line number
Diff line number
Diff line







@@ -141,6 +141,7 @@ struct hda_pcm_stream {







	hda_nid_t nid;	/* default NID to query rates/formats/bps, or set up */









	u32 rates;	/* supported rates */









	u64 formats;	/* supported formats (SNDRV_PCM_FMTBIT_) */









	u32 subformats;	/* for S32_LE format, SNDRV_PCM_SUBFMTBIT_* */









	unsigned int maxbps;	/* supported max. bit per sample */









	const struct snd_pcm_chmap_elem *chmap; /* chmap to override */









	struct hda_pcm_ops ops;








@@ -448,8 +449,8 @@ void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,







#define snd_hda_codec_cleanup_stream(codec, nid) \









	__snd_hda_codec_cleanup_stream(codec, nid, 0)



















#define snd_hda_query_supported_pcm(codec, nid, ratesp, fmtsp, bpsp) \









	snd_hdac_query_supported_pcm(&(codec)->core, nid, ratesp, fmtsp, bpsp)









#define snd_hda_query_supported_pcm(codec, nid, ratesp, fmtsp, subfmtp, bpsp) \









	snd_hdac_query_supported_pcm(&(codec)->core, nid, ratesp, fmtsp, subfmtp, bpsp)









#define snd_hda_is_supported_format(codec, nid, fmt) \









	snd_hdac_is_supported_format(&(codec)->core, nid, fmt)










































include/sound/hdaudio.h



+8
−7






























Original line number
Diff line number
Diff line







@@ -33,7 +33,7 @@ struct hda_device_id;







/*









 * exported bus type









 */









extern struct bus_type snd_hda_bus_type;









extern const struct bus_type snd_hda_bus_type;



















/*









 * generic arrays








@@ -140,13 +140,14 @@ int snd_hdac_get_connections(struct hdac_device *codec, hda_nid_t nid,







			     hda_nid_t *conn_list, int max_conns);









int snd_hdac_get_sub_nodes(struct hdac_device *codec, hda_nid_t nid,









			   hda_nid_t *start_id);









unsigned int snd_hdac_calc_stream_format(unsigned int rate,









					 unsigned int channels,









					 snd_pcm_format_t format,









					 unsigned int maxbps,









					 unsigned short spdif_ctls);









unsigned int snd_hdac_stream_format_bits(snd_pcm_format_t format, snd_pcm_subformat_t subformat,









					 unsigned int maxbits);









unsigned int snd_hdac_stream_format(unsigned int channels, unsigned int bits, unsigned int rate);









unsigned int snd_hdac_spdif_stream_format(unsigned int channels, unsigned int bits,









					  unsigned int rate, unsigned short spdif_ctls);









int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid,









				u32 *ratesp, u64 *formatsp, unsigned int *bpsp);









				 u32 *ratesp, u64 *formatsp, u32 *subformatsp,









				 unsigned int *bpsp);









bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid,









				  unsigned int format);