Commit 5c953a22 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge the 5.11 devel branch for further patching.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 9119e566 4841b8e6

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -14504,10 +14504,18 @@ S: Supported 
F:	drivers/crypto/qat/









QCOM AUDIO (ASoC) DRIVERS









M:	Patrick Lai <plai@codeaurora.org>









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Banajit Goswami <bgoswami@codeaurora.org>









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









S:	Supported









F:	sound/soc/codecs/lpass-va-macro.c









F:	sound/soc/codecs/lpass-wsa-macro.*









F:	sound/soc/codecs/msm8916-wcd-analog.c









F:	sound/soc/codecs/msm8916-wcd-digital.c









F:	sound/soc/codecs/wcd9335.*









F:	sound/soc/codecs/wcd934x.c









F:	sound/soc/codecs/wcd-clsh-v2.*









F:	sound/soc/codecs/wsa881x.c









F:	sound/soc/qcom/

















QCOM IPA DRIVER








@@ -16959,7 +16967,7 @@ M:	Olivier Moysan <olivier.moysan@st.com>







M:	Arnaud Pouliquen <arnaud.pouliquen@st.com>









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









S:	Maintained









F:	Documentation/devicetree/bindings/sound/st,stm32-*.txt









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml









F:	sound/soc/stm/

















STM32 TIMER/LPTIMER DRIVERS
































include/dt-bindings/sound/apq8016-lpass.h



+3
−4






























Original line number
Diff line number
Diff line







@@ -2,9 +2,8 @@







#ifndef __DT_APQ8016_LPASS_H









#define __DT_APQ8016_LPASS_H



















#define MI2S_PRIMARY	0









#define MI2S_SECONDARY	1









#define MI2S_TERTIARY	2









#define MI2S_QUATERNARY	3









#include <dt-bindings/sound/qcom,lpass.h>



















/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */



















#endif /* __DT_APQ8016_LPASS_H */
























include/dt-bindings/sound/qcom,lpass.h
0 → 100644



+15
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 */









#ifndef __DT_QCOM_LPASS_H









#define __DT_QCOM_LPASS_H



















#define MI2S_PRIMARY	0









#define MI2S_SECONDARY	1









#define MI2S_TERTIARY	2









#define MI2S_QUATERNARY	3









#define MI2S_QUINARY	4



















#define LPASS_DP_RX	5



















#define LPASS_MCLK0	0



















#endif /* __DT_QCOM_LPASS_H */
























include/dt-bindings/sound/sc7180-lpass.h



+2
−4






























Original line number
Diff line number
Diff line







@@ -2,10 +2,8 @@







#ifndef __DT_SC7180_LPASS_H









#define __DT_SC7180_LPASS_H



















#define MI2S_PRIMARY	0









#define MI2S_SECONDARY	1









#define LPASS_DP_RX	2









#include <dt-bindings/sound/qcom,lpass.h>



















#define LPASS_MCLK0	0









/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */



















#endif /* __DT_APQ8016_LPASS_H */
























include/sound/pcm.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -229,7 +229,7 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params,







struct snd_pcm_hw_rule {









	unsigned int cond;









	int var;









	int deps[4];









	int deps[5];



















	snd_pcm_hw_rule_func_t func;









	void *private;