aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch b/target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch
new file mode 100644
index 0000000000..883cd42d09
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0023-MLK-10036-crypto-caam-add-support-for-DSM-with-Mega-.patch
@@ -0,0 +1,81 @@
+From 1ffdfbcd42dbb87f2841e45c0719a3fbcb2fe926 Mon Sep 17 00:00:00 2001
+From: Victoria Milhoan <vicki.milhoan@freescale.com>
+Date: Thu, 18 Dec 2014 14:06:50 -0700
+Subject: [PATCH] MLK-10036 crypto: caam - add support for DSM with Mega/Fast
+ mix on
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch allows CAAM to be enabled as a wakeup source for the
+Mega/Fast mix domain. If CAAM is enabled as a wakeup source, it
+will continue to be powered on across Deep Sleep Mode (DSM). This
+allows CAAM to be functional after the system resumes from DSM.
+
+Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
+(cherry picked from commit 290744e3b40a563319324e234fa5a65b49fd4d82)
+Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
+Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
+(cherry picked from commit 0bf9c6f84f1d74d9e6d9384c4b11bbdf9301c94e)
+
+Changed commit headline prefix.
+
+Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
+---
+ drivers/crypto/caam/jr.c | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+--- a/drivers/crypto/caam/jr.c
++++ b/drivers/crypto/caam/jr.c
+@@ -561,11 +561,41 @@ static int caam_jr_probe(struct platform
+
+ atomic_set(&jrpriv->tfm_count, 0);
+
++ device_init_wakeup(&pdev->dev, 1);
++ device_set_wakeup_enable(&pdev->dev, false);
++
+ register_algs(jrdev->parent);
+
+ return 0;
+ }
+
++#ifdef CONFIG_PM
++static int caam_jr_suspend(struct device *dev)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct caam_drv_private_jr *jrpriv = platform_get_drvdata(pdev);
++
++ if (device_may_wakeup(&pdev->dev))
++ enable_irq_wake(jrpriv->irq);
++
++ return 0;
++}
++
++static int caam_jr_resume(struct device *dev)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct caam_drv_private_jr *jrpriv = platform_get_drvdata(pdev);
++
++ if (device_may_wakeup(&pdev->dev))
++ disable_irq_wake(jrpriv->irq);
++
++ return 0;
++}
++
++static SIMPLE_DEV_PM_OPS(caam_jr_pm_ops, caam_jr_suspend,
++ caam_jr_resume);
++#endif
++
+ static const struct of_device_id caam_jr_match[] = {
+ {
+ .compatible = "fsl,sec-v4.0-job-ring",
+@@ -581,6 +611,9 @@ static struct platform_driver caam_jr_dr
+ .driver = {
+ .name = "caam_jr",
+ .of_match_table = caam_jr_match,
++#ifdef CONFIG_PM
++ .pm = &caam_jr_pm_ops,
++#endif
+ },
+ .probe = caam_jr_probe,
+ .remove = caam_jr_remove,