[ sunxi-current ] add upstream patches

This commit is contained in:
5kft 2020-05-05 10:57:50 -07:00
parent d4960c7ab7
commit ab96d0193d
No known key found for this signature in database
GPG Key ID: E52EB173023CF0C8
3 changed files with 31 additions and 2 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.4.37 Kernel Configuration
# Linux/arm 5.4.38 Kernel Configuration
#
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.4.37 Kernel Configuration
# Linux/arm64 5.4.38 Kernel Configuration
#
#

View File

@ -0,0 +1,29 @@
diff --git a/Makefile b/Makefile
index 33690285d6aa..989e7d649633 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
-SUBLEVEL = 37
+SUBLEVEL = 38
EXTRAVERSION =
NAME = Kleptomaniac Octopus
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 2b04ac3d8fd3..1f698adde506 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -586,10 +586,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
ret = axg_card_parse_tdm(card, np, index);
- else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {
+ else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))
dai_link->params = &codec_params;
- dai_link->no_pcm = 0; /* link is not a DPCM BE */
- }
return ret;
}