commit 46fa9c1116d808cc012275d8f8bf5d5b0dfb9c56
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 02 20:56:41 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 02 20:56:41 2019 -0700
tree d9391bac95f4668be4596d5cbae7e07f1614f961
parent 8f9f0424745034e865a5d3ecb2bd9107ca577aee
parent 6c6884d8740fec96c6a72ebf60ac005978deb7a7

Merge "asoc: Check backend index to apply channel map" into audio-drivers.lnx.2.0

asoc/codecs/wcd934x/wcd934x.c

diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c
index aa4afdc..c800e95 100644
--- a/asoc/codecs/wcd934x/wcd934x.c
+++ b/asoc/codecs/wcd934x/wcd934x.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -8742,7 +8742,7 @@
 			.rate_min = 8000,
 			.rate_max = 192000,
 			.channels_min = 1,
-			.channels_max = 4,
+			.channels_max = 8,
 		},
 		.ops = &tavil_dai_ops,
 	},

asoc/msm-pcm-q6-v2.c

diff --git a/asoc/msm-pcm-q6-v2.c b/asoc/msm-pcm-q6-v2.c
index 672396f..62324e2 100644
--- a/asoc/msm-pcm-q6-v2.c
+++ b/asoc/msm-pcm-q6-v2.c
@@ -75,7 +75,7 @@
 	.rate_min =             8000,
 	.rate_max =             384000,
 	.channels_min =         1,
-	.channels_max =         4,
+	.channels_max =         8,
 	.buffer_bytes_max =     CAPTURE_MAX_NUM_PERIODS *
 				CAPTURE_MAX_PERIOD_SIZE,
 	.period_bytes_min =	CAPTURE_MIN_PERIOD_SIZE,