diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-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/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch b/target/linux/layerscape/patches-5.4/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch new file mode 100644 index 0000000000..c6fc11c1c5 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/806-dma-0024-MLK-22302-2-dmaengine-fsl-edma-v3-fix-build-warning-.patch @@ -0,0 +1,39 @@ +From 88ac887c165bffe8b03cc81a74d089abc4c02cd1 Mon Sep 17 00:00:00 2001 +From: Robin Gong <yibin.gong@nxp.com> +Date: Tue, 23 Jul 2019 23:42:53 +0800 +Subject: [PATCH] MLK-22302-2: dmaengine: fsl-edma-v3: fix build warning with + CONFIG_PM_SLEEP=n + +Fix build waring with CONFIG_PM_SLEEP=n. + +Signed-off-by: Robin Gong <yibin.gong@nxp.com> +Reviewed-by: Andy Duan <fugang.duan@nxp.com> +(cherry picked from commit dfe2a755209615f9592ed937957b2efdc3b6d6c0) +--- + drivers/dma/fsl-edma-v3.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/dma/fsl-edma-v3.c ++++ b/drivers/dma/fsl-edma-v3.c +@@ -1040,6 +1040,7 @@ static int fsl_edma3_remove(struct platf + return 0; + } + ++#ifdef CONFIG_PM_SLEEP + static int fsl_edma3_suspend_late(struct device *dev) + { + struct fsl_edma3_engine *fsl_edma = dev_get_drvdata(dev); +@@ -1097,10 +1098,11 @@ static int fsl_edma3_resume_early(struct + + return 0; + } ++#endif + + static const struct dev_pm_ops fsl_edma3_pm_ops = { +- .suspend_late = fsl_edma3_suspend_late, +- .resume_early = fsl_edma3_resume_early, ++ SET_LATE_SYSTEM_SLEEP_PM_OPS(fsl_edma3_suspend_late, ++ fsl_edma3_resume_early) + }; + + static const struct of_device_id fsl_edma3_dt_ids[] = { |