forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' into for-next
Back-merge the 5.11 devel branch for further patching. Signed-off-by: Takashi Iwai <[email protected]>
- Loading branch information
Showing
36 changed files
with
261 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# | |
title: Mediatek MT8192 with MT6359, RT1015 and RT5682 ASoC sound card driver | ||
|
||
maintainers: | ||
- Jiaxin Yu <[email protected]> | ||
- Shane Chien <[email protected]> | ||
- Jiaxin Yu <[email protected]> | ||
- Shane Chien <[email protected]> | ||
|
||
description: | ||
This binding describes the MT8192 sound card. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
L: [email protected] (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 <[email protected]> | |
M: Arnaud Pouliquen <[email protected]> | ||
L: [email protected] (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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/* 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 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.