Fix and rebase patches on Librem5 5.15.14

reform2-imx8mq/template-kernel/patches/caam-revert-swiotlb-origaddr.patch

-commit 7c61e7a9318a9d506440d276748d2cdc05e07298
-Author: Lukas F. Hartmann <lukas@mntre.com>
-Date:   Tue Jun 8 03:08:20 2021 +0200
-
-    Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single"
-    
-    This reverts commit 16fc3cef33a04632ab6b31758abdd77563a20759.
-
-diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
-index c10e855a03b..a817dc5537b 100644
---- a/kernel/dma/swiotlb.c
-+++ b/kernel/dma/swiotlb.c
-@@ -726,6 +726,7 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
- 
- 	if (orig_addr == INVALID_PHYS_ADDR)
- 		return;
-+	orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1);
- 
- 	validate_sync_size_and_truncate(hwdev, orig_size, &size);
- 

reform2-imx8mq/template-kernel/patches/mnt4001-lcdif-fix-pcie-interference.patch

@@ -2,9 +2,9 @@ diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms
 index 3e1bb0aefb87..13128b6f2770 100644
 --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
 +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
-@@ -212,7 +212,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
+@@ -251,7 +251,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
  
- 	mxsfb_set_formats(mxsfb);
+ 	mxsfb_set_formats(mxsfb, bus_format);
  
 -	clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
 +	clk_set_rate(mxsfb->clk, m->crtc_clock * 660);

reform2-imx8mq/template-kernel/patches/mnt5000-imx8mq-import-HDMI-driver-and-make-DCSS-compatible.patch

@@ -49,7 +49,7 @@ diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cad
 index ef8c230e0f62..e5204d0f8d3f 100644
 --- a/drivers/gpu/drm/bridge/cadence/Kconfig
 +++ b/drivers/gpu/drm/bridge/cadence/Kconfig
-@@ -38,3 +38,14 @@ config DRM_CDNS_HDMI
+@@ -38,3 +38,13 @@ config DRM_CDNS_HDMI
  config DRM_CDNS_HDMI
  	tristate "Cadence HDMI DRM driver"
  	depends on DRM_CDNS_MHDP
@@ -63,7 +63,6 @@ index ef8c230e0f62..e5204d0f8d3f 100644
 +	depends on DRM_CDNS_HDMI
 +	select CEC_CORE
 +	select CEC_NOTIFIER
-+
 diff --git a/drivers/gpu/drm/bridge/cadence/Makefile b/drivers/gpu/drm/bridge/cadence/Makefile
 index 8f647991b374..a80daffb4f59 100644
 --- a/drivers/gpu/drm/bridge/cadence/Makefile
@@ -425,9 +424,8 @@ index 000000000000..af8506444f6e
 +MODULE_AUTHOR("Sandor.Yu@NXP.com");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("NXP CDNS MHDP HDMI CEC driver");
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
-b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
-index 6965950cc..9ea451240 100644
+diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
+index 6965950cc..d58dc65a5 100644
 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
 +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
 @@ -30,6 +30,12 @@ void cdns_mhdp_bus_write(u32 val, struct cdns_mhdp_device *mhdp, u32 offset)
@@ -447,7 +445,7 @@ diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
 index 6231048aa5aa..74592ac2889b 100644
 --- a/drivers/gpu/drm/imx/Kconfig
 +++ b/drivers/gpu/drm/imx/Kconfig
-@@ -40,4 +40,13 @@ config DRM_IMX_HDMI
+@@ -40,5 +40,14 @@ config DRM_IMX_HDMI
  	help
  	  Choose this if you want to use HDMI on i.MX6.
  
@@ -461,6 +459,7 @@ index 6231048aa5aa..74592ac2889b 100644
 +          Choose this if you want to use HDMI on i.MX8.
 +
  source "drivers/gpu/drm/imx/dcss/Kconfig"
+ source "drivers/gpu/drm/imx/mhdp/Kconfig"
 diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.c b/drivers/gpu/drm/imx/dcss/dcss-dev.c
 index c849533ca83e..fe4600b8f833 100644
 --- a/drivers/gpu/drm/imx/dcss/dcss-dev.c