5.2-stable patches

added patches:
	clk-imx-imx8mm-fix-audio-pll-setting.patch
	crypto-talitos-fix-missing-break-in-switch-statement.patch

diff --git a/queue-5.2/clk-imx-imx8mm-fix-audio-pll-setting.patch b/queue-5.2/clk-imx-imx8mm-fix-audio-pll-setting.patch
new file mode 100644 (file)
index 0000000..77a3409
--- /dev/null
+++ b/queue-5.2/clk-imx-imx8mm-fix-audio-pll-setting.patch
@@ -0,0 +1,38 @@
+From 053a4ffe298836bb973d2cba59f82fff60c7db5b Mon Sep 17 00:00:00 2001
+From: Peng Fan <peng.fan@nxp.com>
+Date: Mon, 15 Jul 2019 02:55:43 +0000
+Subject: clk: imx: imx8mm: fix audio pll setting
+
+From: Peng Fan <peng.fan@nxp.com>
+
+commit 053a4ffe298836bb973d2cba59f82fff60c7db5b upstream.
+
+The AUDIO PLL max support 650M, so the original clk settings violate
+spec. This patch makes the output 786432000 -> 393216000,
+and 722534400 -> 361267200 to aligned with NXP vendor kernel without any
+impact on audio functionality and go within 650MHz PLL limit.
+
+Cc: <stable@vger.kernel.org>
+Fixes: ba5625c3e272 ("clk: imx: Add clock driver support for imx8mm")
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+Acked-by: Abel Vesa <abel.vesa@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/clk/imx/clk-imx8mm.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/clk/imx/clk-imx8mm.c
++++ b/drivers/clk/imx/clk-imx8mm.c
+@@ -55,8 +55,8 @@ static const struct imx_pll14xx_rate_tab
+ };
+ 
+ static const struct imx_pll14xx_rate_table imx8mm_audiopll_tbl[] = {
+-      PLL_1443X_RATE(786432000U, 655, 5, 2, 23593),
+-      PLL_1443X_RATE(722534400U, 301, 5, 1, 3670),
++      PLL_1443X_RATE(393216000U, 262, 2, 3, 9437),
++      PLL_1443X_RATE(361267200U, 361, 3, 3, 17511),
+ };
+ 
+ static const struct imx_pll14xx_rate_table imx8mm_videopll_tbl[] = {

diff --git a/queue-5.2/crypto-talitos-fix-missing-break-in-switch-statement.patch b/queue-5.2/crypto-talitos-fix-missing-break-in-switch-statement.patch
new file mode 100644 (file)
index 0000000..d9860f2
--- /dev/null
+++ b/queue-5.2/crypto-talitos-fix-missing-break-in-switch-statement.patch
@@ -0,0 +1,34 @@
+From 5fc194ea6d34dfad9833d3043ce41d6c52aff39a Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 9 Sep 2019 00:29:52 -0500
+Subject: crypto: talitos - fix missing break in switch statement
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit 5fc194ea6d34dfad9833d3043ce41d6c52aff39a upstream.
+
+Add missing break statement in order to prevent the code from falling
+through to case CRYPTO_ALG_TYPE_AHASH.
+
+Fixes: aeb4c132f33d ("crypto: talitos - Convert to new AEAD interface")
+Cc: stable@vger.kernel.org
+Reported-by: kbuild test robot <lkp@intel.com>
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/talitos.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -3190,6 +3190,7 @@ static int talitos_remove(struct platfor
+                       break;
+               case CRYPTO_ALG_TYPE_AEAD:
+                       crypto_unregister_aead(&t_alg->algt.alg.aead);
++                      break;
+               case CRYPTO_ALG_TYPE_AHASH:
+                       crypto_unregister_ahash(&t_alg->algt.alg.hash);
+                       break;

diff --git a/queue-5.2/series b/queue-5.2/series
index ab1c19496947363f6757a94c2d32fb541e338bcf..b6f002c0d26799e81fcefa8f1efa4534ad3757c8 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -16,3 +16,5 @@ hid-logitech-dj-fix-crash-when-initial-logi_dj_recv_query_paired_devices-fails.p
 hid-hidraw-fix-invalid-read-in-hidraw_ioctl.patch
 hid-add-quirk-for-hp-x500-pixart-oem-mouse.patch
 mtd-cfi_cmdset_0002-use-chip_good-to-retry-in-do_write_oneword.patch
+crypto-talitos-fix-missing-break-in-switch-statement.patch
+clk-imx-imx8mm-fix-audio-pll-setting.patch