Unverified Commit 2927e6d3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.11' into asoc-5.12

parents 6395a621 b976a5ad

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -14510,10 +14510,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








@@ -16964,7 +16972,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 */
























sound/soc/amd/raven/pci-acp3x.c



+3
−13






























Original line number
Diff line number
Diff line







@@ -140,21 +140,14 @@ static int snd_acp3x_probe(struct pci_dev *pci,







		goto release_regions;









	}



















	/* check for msi interrupt support */









	ret = pci_enable_msi(pci);









	if (ret)









		/* msi is not enabled */









	irqflags = IRQF_SHARED;









	else









		/* msi is enabled */









		irqflags = 0;



















	addr = pci_resource_start(pci, 0);









	adata->acp3x_base = devm_ioremap(&pci->dev, addr,









					pci_resource_len(pci, 0));









	if (!adata->acp3x_base) {









		ret = -ENOMEM;









		goto disable_msi;









		goto release_regions;









	}









	pci_set_master(pci);









	pci_set_drvdata(pci, adata);








@@ -162,7 +155,7 @@ static int snd_acp3x_probe(struct pci_dev *pci,







	adata->pme_en = rv_readl(adata->acp3x_base + mmACP_PME_EN);









	ret = acp3x_init(adata);









	if (ret)









		goto disable_msi;









		goto release_regions;



















	val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG);









	switch (val) {








@@ -251,8 +244,6 @@ static int snd_acp3x_probe(struct pci_dev *pci,







de_init:









	if (acp3x_deinit(adata->acp3x_base))









		dev_err(&pci->dev, "ACP de-init failed\n");









disable_msi:









	pci_disable_msi(pci);









release_regions:









	pci_release_regions(pci);









disable_pci:








@@ -311,7 +302,6 @@ static void snd_acp3x_remove(struct pci_dev *pci)







		dev_err(&pci->dev, "ACP de-init failed\n");









	pm_runtime_forbid(&pci->dev);









	pm_runtime_get_noresume(&pci->dev);









	pci_disable_msi(pci);









	pci_release_regions(pci);









	pci_disable_device(pci);









}