Merge pull request #6423 from heitbaum/kernel11

linux: update to 5.18.y
2025-07-24 11:16:51 +00:00 · 2022-05-25 21:46:47 +02:00 · 2022-05-25 21:46:47 +02:00 · 5d4fb9bbe7
commit 5d4fb9bbe7
parent 992e6c181f d4293c37ee
42 changed files with 4572 additions and 4779 deletions
--- a/packages/linux-drivers/RTL8192DU/package.mk
+++ b/packages/linux-drivers/RTL8192DU/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8192DU"
-PKG_VERSION="eb09a4e6e96a5a033afe60c71022bfa42eea148a"
-PKG_SHA256="e78c4fc28a66c1f15154a26c93bee9696965fe81a3246a751c2b4d1fa10e3454"
+PKG_VERSION="a4e32040416d2dba2611a8f410a4f7663a425eb3"
+PKG_SHA256="1b3db84d541d12ac898aed23f4c45cd20382546cc1804a0bbd93fb3d80361b5a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lwfinger/rtl8192du"
 PKG_URL="https://github.com/lwfinger/rtl8192du/archive/${PKG_VERSION}.tar.gz"
--- a/packages/linux-drivers/RTL8192DU/patches/aarch64/RTL8192DU-0102-fix-multiple-definitions.patch
+++ b/packages/linux-drivers/RTL8192DU/patches/aarch64/RTL8192DU-0102-fix-multiple-definitions.patch
@ -1,26 +0,0 @@
-diff --git a/include/ieee80211.h b/include/ieee80211.h
-index 3c28a0b..2268fbd 100644
--- a/include/ieee80211.h
-+++ b/include/ieee80211.h
-@@ -969,18 +969,18 @@ enum ieee80211_state {
- #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
- #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
- 
-extern __inline int is_multicast_mac_addr(const u8 *addr)
-+static __inline int is_multicast_mac_addr(const u8 *addr)
- {
-         return ((addr[0] != 0xff) && (0x01 & addr[0]));
- }
- 
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
-+static __inline int is_broadcast_mac_addr(const u8 *addr)
- {
- 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
- 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
- }
- 
-extern __inline int is_zero_mac_addr(const u8 *addr)
-+static __inline int is_zero_mac_addr(const u8 *addr)
- {
- 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
- 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
--- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-0001-fix-5-18.patch
+++ b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-0001-fix-5-18.patch
@ -0,0 +1,24 @@
+--- a/include/ieee80211.h	2022-04-25 12:34:26.110654447 +0000
+++ b/include/ieee80211.h	2022-04-25 12:34:26.110654447 +0000
+@@ -1616,18 +1616,18 @@
+ 	(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
+ 				     (((Addr[5]) & 0xff) == 0xff))
+ #else
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
+static inline int is_multicast_mac_addr(const u8 *addr)
+ {
+ 	return (addr[0] != 0xff) && (0x01 & addr[0]);
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+ }
+ 
+-extern __inline int is_zero_mac_addr(const u8 *addr)
+static inline int is_zero_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
+ 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.18-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.18-fix.patch
@ -0,0 +1,66 @@
+diff -Nur a/x86-64/src/shared/linux_osl.c b/x86-64/src/shared/linux_osl.c
+--- a/x86-64/src/shared/linux_osl.c	2022-04-24 11:17:29.148114284 +0000
+++ b/x86-64/src/shared/linux_osl.c	2022-04-24 11:38:38.493710528 +0000
+@@ -600,7 +600,11 @@
+ 	if (va)
+ 		*pap = (ulong)__virt_to_phys(va);
+ #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+ 	va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap);
+#else
+	va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC);
+#endif
+ #endif
+ 	return va;
+ }
+@@ -613,7 +617,11 @@
+ #ifdef __ARM_ARCH_7A__
+ 	kfree(va);
+ #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+ 	pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
+#else
+	dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa);
+#endif
+ #endif
+ }
+ 
+@@ -623,7 +631,11 @@
+ 	int dir;
+ 
+ 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+ 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+#else
+	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
+#endif
+ 
+ #if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL)
+ 	if (dmah != NULL) {
+@@ -656,7 +668,12 @@
+ 	}
+ #endif 
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+ 	return (pci_map_single(osh->pdev, va, size, dir));
+#else
+	return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir));
+#endif 
+	return 0;
+ }
+ 
+ void BCMFASTPATH
+@@ -665,8 +681,13 @@
+ 	int dir;
+ 
+ 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+ 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+ 	pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
+#else
+	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
+	dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir);
+#endif
+ }
+ 
+ #if defined(BCMDBG_ASSERT)
--- a/packages/linux-firmware/iwlwifi-firmware/package.mk
+++ b/packages/linux-firmware/iwlwifi-firmware/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="iwlwifi-firmware"
-PKG_VERSION="ccf1a23d7f51e98562664c1ae80f51437b1c39dc"
-PKG_SHA256="5e3ca25ceb47571e7639a03d6350179834df90a31eb98a5b37536fec4dbace7e"
+PKG_VERSION="9c65a729599eda5cd4ffcae6acc64e00d2f8a058"
+PKG_SHA256="d34bb99563f60ce6a1c1ca645da0a9dbf476a21230c58f5353c5db4472d5ed4e"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware"
 PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz"
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="kernel-firmware"
-PKG_VERSION="20220209"
-PKG_SHA256="2fd289256b6127a6528b2243e0227bfe1750833c725b5c9139fad183e94d4172"
+PKG_VERSION="20220509"
+PKG_SHA256="376e0b3d7b4f8aaa2abf7f5ab74803dcf14b06b94e3d841b1467cd9a2848255e"
 PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
-PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${PKG_VERSION}.tar.gz"
+PKG_URL="https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PKG_VERSION}.tar.xz"
 PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}"
 PKG_LONGDESC="kernel-firmware: kernel related firmware"
 PKG_TOOLCHAIN="manual"
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -28,8 +28,8 @@ case "${LINUX}" in
    PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
    ;;
  *)
-    PKG_VERSION="5.17.4"
-    PKG_SHA256="6e3cd56ee83a9cb5ac3fde1442c40367ab67368946c4c93bbeb1c65664a0d3c5"
+    PKG_VERSION="5.18"
+    PKG_SHA256="51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
    PKG_PATCH_DIRS="default"
    ;;
--- a/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
+++ b/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
@ -12,7 +12,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 2 files changed, 18 insertions(+)

 diff --git a/libavutil/buffer.c b/libavutil/buffer.c
-index 858633e8c73b..41555d998257 100644
+index 858633e8c73..41555d99825 100644
 --- a/libavutil/buffer.c
 +++ b/libavutil/buffer.c
@@ -305,6 +305,19 @@ static void buffer_pool_free(AVBufferPool *pool)
@ -36,7 +36,7 @@ index 858633e8c73b..41555d998257 100644
 {
     AVBufferPool *pool;
 diff --git a/libavutil/buffer.h b/libavutil/buffer.h
-index 241a80ed6709..f41363faf1dc 100644
+index 241a80ed670..f41363faf1d 100644
 --- a/libavutil/buffer.h
 +++ b/libavutil/buffer.h
@@ -315,6 +315,11 @@ AVBufferPool *av_buffer_pool_init2(size_t size, void *opaque,
@ -69,7 +69,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 create mode 100644 libavcodec/v4l2_request.h

 diff --git a/configure b/configure
-index d7a3f507e834..f2e203d13463 100755
+index d7a3f507e83..f2e203d1346 100755
 --- a/configure
 +++ b/configure
@@ -279,6 +279,7 @@ External library support:
@ -141,7 +141,7 @@ index d7a3f507e834..f2e203d13463 100755
 test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
 
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 33a280cf6953..90dfffcb2004 100644
+index 33a280cf695..90dfffcb200 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -155,6 +155,7 @@ OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
@ -153,7 +153,7 @@ index 33a280cf6953..90dfffcb2004 100644
 OBJS-$(CONFIG_WMV2DSP)                 += wmv2dsp.o
 
 diff --git a/libavcodec/hwconfig.h b/libavcodec/hwconfig.h
-index f421dc909f44..ee78d8ab8e89 100644
+index f421dc909f4..ee78d8ab8e8 100644
 --- a/libavcodec/hwconfig.h
 +++ b/libavcodec/hwconfig.h
@@ -80,6 +80,8 @@ typedef struct AVCodecHWConfigInternal {
@ -167,7 +167,7 @@ index f421dc909f44..ee78d8ab8e89 100644
     &(const AVCodecHWConfigInternal) { \
 diff --git a/libavcodec/v4l2_request.c b/libavcodec/v4l2_request.c
 new file mode 100644
-index 000000000000..5234b5049b0d
+index 00000000000..5234b5049b0
 --- /dev/null
 +++ b/libavcodec/v4l2_request.c
@@ -0,0 +1,984 @@
@ -1157,7 +1157,7 @@ index 000000000000..5234b5049b0d
 +}
 diff --git a/libavcodec/v4l2_request.h b/libavcodec/v4l2_request.h
 new file mode 100644
-index 000000000000..58d2aa70af80
+index 00000000000..58d2aa70af8
 --- /dev/null
 +++ b/libavcodec/v4l2_request.h
@@ -0,0 +1,77 @@
@ -1254,7 +1254,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
-index 2d0605c7f4f6..c3a7338a7043 100644
+index 2d0605c7f4f..c3a7338a704 100644
 --- a/libavcodec/h264_slice.c
 +++ b/libavcodec/h264_slice.c
@@ -1830,7 +1830,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -1267,7 +1267,7 @@ index 2d0605c7f4f6..c3a7338a7043 100644
     if (sps->poc_type == 0) {
         sl->poc_lsb = get_bits(&sl->gb, sps->log2_max_poc_lsb);
 diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
-index b7b19ba4f162..0698ab95ba51 100644
+index b7b19ba4f16..0698ab95ba5 100644
 --- a/libavcodec/h264dec.h
 +++ b/libavcodec/h264dec.h
@@ -336,6 +336,7 @@ typedef struct H264SliceContext {
@ -1295,7 +1295,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 2 files changed, 7 insertions(+), 1 deletion(-)

 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
-index c3a7338a7043..c28b58cd5d95 100644
+index c3a7338a704..c28b58cd5d9 100644
 --- a/libavcodec/h264_slice.c
 +++ b/libavcodec/h264_slice.c
@@ -1748,7 +1748,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -1336,7 +1336,7 @@ index c3a7338a7043..c28b58cd5d95 100644
 
     if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) {
 diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
-index 0698ab95ba51..2b39e82c3b03 100644
+index 0698ab95ba5..2b39e82c3b0 100644
 --- a/libavcodec/h264dec.h
 +++ b/libavcodec/h264dec.h
@@ -329,6 +329,7 @@ typedef struct H264SliceContext {
@ -1374,7 +1374,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 create mode 100644 libavcodec/v4l2_request_h264.c

 diff --git a/configure b/configure
-index f2e203d13463..b17e4108c1b6 100755
+index f2e203d1346..b17e4108c1b 100755
 --- a/configure
 +++ b/configure
@@ -2951,6 +2951,8 @@ h264_dxva2_hwaccel_deps="dxva2"
@ -1395,7 +1395,7 @@ index f2e203d13463..b17e4108c1b6 100755
 check_headers sys/videoio.h
 test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 90dfffcb2004..426c7528e904 100644
+index 90dfffcb200..426c7528e90 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -935,6 +935,7 @@ OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
@ -1407,7 +1407,7 @@ index 90dfffcb2004..426c7528e904 100644
 OBJS-$(CONFIG_H264_VDPAU_HWACCEL)         += vdpau_h264.o
 OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
-index c28b58cd5d95..0a10d00aad9e 100644
+index c28b58cd5d9..0a10d00aad9 100644
 --- a/libavcodec/h264_slice.c
 +++ b/libavcodec/h264_slice.c
@@ -768,6 +768,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -1429,7 +1429,7 @@ index c28b58cd5d95..0a10d00aad9e 100644
             if (h->avctx->codec->pix_fmts)
                 choices = h->avctx->codec->pix_fmts;
 diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
-index 0a999bef43d9..d78e3eaee3a8 100644
+index 0a999bef43d..d78e3eaee3a 100644
 --- a/libavcodec/h264dec.c
 +++ b/libavcodec/h264dec.c
@@ -1076,6 +1076,9 @@ AVCodec ff_h264_decoder = {
@ -1443,7 +1443,7 @@ index 0a999bef43d9..d78e3eaee3a8 100644
                                NULL
                            },
 diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
-index 8e54cf73f90f..969a1da0f4bc 100644
+index 8e54cf73f90..969a1da0f4b 100644
 --- a/libavcodec/hwaccels.h
 +++ b/libavcodec/hwaccels.h
@@ -32,6 +32,7 @@ extern const AVHWAccel ff_h264_d3d11va_hwaccel;
@ -1456,7 +1456,7 @@ index 8e54cf73f90f..969a1da0f4bc 100644
 extern const AVHWAccel ff_h264_videotoolbox_hwaccel;
 diff --git a/libavcodec/v4l2_request_h264.c b/libavcodec/v4l2_request_h264.c
 new file mode 100644
-index 000000000000..88da8f0a2db0
+index 00000000000..88da8f0a2db
 --- /dev/null
 +++ b/libavcodec/v4l2_request_h264.c
@@ -0,0 +1,456 @@
@ -1933,7 +1933,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 create mode 100644 libavcodec/v4l2_request_mpeg2.c

 diff --git a/configure b/configure
-index b17e4108c1b6..ec141fabbdc1 100755
+index b17e4108c1b..ec141fabbdc 100755
 --- a/configure
 +++ b/configure
@@ -2995,6 +2995,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2"
@ -1954,7 +1954,7 @@ index b17e4108c1b6..ec141fabbdc1 100755
 check_headers sys/videoio.h
 test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 426c7528e904..02c023a44772 100644
+index 426c7528e90..02c023a4477 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -955,6 +955,7 @@ OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL)      += dxva2_mpeg2.o
@ -1966,7 +1966,7 @@ index 426c7528e904..02c023a44772 100644
 OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)        += vdpau_mpeg12.o
 OBJS-$(CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
 diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
-index 969a1da0f4bc..a8ae1483d8e1 100644
+index 969a1da0f4b..a8ae1483d8e 100644
 --- a/libavcodec/hwaccels.h
 +++ b/libavcodec/hwaccels.h
@@ -53,6 +53,7 @@ extern const AVHWAccel ff_mpeg2_d3d11va_hwaccel;
@ -1978,7 +1978,7 @@ index 969a1da0f4bc..a8ae1483d8e1 100644
 extern const AVHWAccel ff_mpeg2_vdpau_hwaccel;
 extern const AVHWAccel ff_mpeg2_videotoolbox_hwaccel;
 diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
-index 94221da2c158..4b0176f6cb19 100644
+index 94221da2c15..4b0176f6cb1 100644
 --- a/libavcodec/mpeg12dec.c
 +++ b/libavcodec/mpeg12dec.c
@@ -1147,6 +1147,9 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
@ -2003,7 +2003,7 @@ index 94221da2c158..4b0176f6cb19 100644
                     },
 diff --git a/libavcodec/v4l2_request_mpeg2.c b/libavcodec/v4l2_request_mpeg2.c
 new file mode 100644
-index 000000000000..84d53209c79d
+index 00000000000..84d53209c79
 --- /dev/null
 +++ b/libavcodec/v4l2_request_mpeg2.c
@@ -0,0 +1,159 @@
@ -2185,7 +2185,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 create mode 100644 libavcodec/v4l2_request_vp8.c

 diff --git a/configure b/configure
-index ec141fabbdc1..f16bed65a3a3 100755
+index ec141fabbdc..f16bed65a3a 100755
 --- a/configure
 +++ b/configure
@@ -3027,6 +3027,8 @@ vc1_vdpau_hwaccel_deps="vdpau"
@ -2206,7 +2206,7 @@ index ec141fabbdc1..f16bed65a3a3 100755
 check_headers sys/videoio.h
 test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 02c023a44772..c79d678eb3ee 100644
+index 02c023a4477..c79d678eb3e 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -971,6 +971,7 @@ OBJS-$(CONFIG_VC1_QSV_HWACCEL)            += qsvdec.o
@ -2218,7 +2218,7 @@ index 02c023a44772..c79d678eb3ee 100644
 OBJS-$(CONFIG_VP9_D3D11VA_HWACCEL)        += dxva2_vp9.o
 OBJS-$(CONFIG_VP9_DXVA2_HWACCEL)          += dxva2_vp9.o
 diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
-index a8ae1483d8e1..9f8d41e367ed 100644
+index a8ae1483d8e..9f8d41e367e 100644
 --- a/libavcodec/hwaccels.h
 +++ b/libavcodec/hwaccels.h
@@ -69,6 +69,7 @@ extern const AVHWAccel ff_vc1_nvdec_hwaccel;
@ -2231,7 +2231,7 @@ index a8ae1483d8e1..9f8d41e367ed 100644
 extern const AVHWAccel ff_vp9_d3d11va2_hwaccel;
 diff --git a/libavcodec/v4l2_request_vp8.c b/libavcodec/v4l2_request_vp8.c
 new file mode 100644
-index 000000000000..bc0fc400727a
+index 00000000000..bc0fc400727
 --- /dev/null
 +++ b/libavcodec/v4l2_request_vp8.c
@@ -0,0 +1,180 @@
@ -2416,7 +2416,7 @@ index 000000000000..bc0fc400727a
 +    .caps_internal  = HWACCEL_CAP_ASYNC_SAFE,
 +};
 diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
-index d16e7b6aa34e..8ee768d875ad 100644
+index d16e7b6aa34..8ee768d875a 100644
 --- a/libavcodec/vp8.c
 +++ b/libavcodec/vp8.c
@@ -176,6 +176,9 @@ static enum AVPixelFormat get_pixel_format(VP8Context *s)
@ -2440,7 +2440,7 @@ index d16e7b6aa34e..8ee768d875ad 100644
                                NULL
                            },

-From 3c09465f9dee3355b0ef68140b86e9e66797b5fc Mon Sep 17 00:00:00 2001
+From 41c38b001277f252c052ba0493546184760a0a8e Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 15 Dec 2018 22:32:16 +0100
 Subject: [PATCH 08/17] Add V4L2 request API hevc hwaccel
@ -2452,12 +2452,12 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 libavcodec/Makefile            |   1 +
 libavcodec/hevcdec.c           |  10 +
 libavcodec/hwaccels.h          |   1 +
- libavcodec/v4l2_request_hevc.c | 604 +++++++++++++++++++++++++++++++++
- 5 files changed, 619 insertions(+)
+ libavcodec/v4l2_request_hevc.c | 580 +++++++++++++++++++++++++++++++++
+ 5 files changed, 595 insertions(+)
 create mode 100644 libavcodec/v4l2_request_hevc.c

 diff --git a/configure b/configure
-index f16bed65a3a3..02a80cf27fd7 100755
+index f16bed65a3a..02a80cf27fd 100755
 --- a/configure
 +++ b/configure
@@ -2967,6 +2967,8 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
@ -2478,7 +2478,7 @@ index f16bed65a3a3..02a80cf27fd7 100755
 check_cc vp8_v4l2_request linux/videodev2.h "int i = V4L2_PIX_FMT_VP8_FRAME;"
 
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index c79d678eb3ee..0059074530c5 100644
+index c79d678eb3e..0059074530c 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -943,6 +943,7 @@ OBJS-$(CONFIG_HEVC_D3D11VA_HWACCEL)       += dxva2_hevc.o
@ -2490,7 +2490,7 @@ index c79d678eb3ee..0059074530c5 100644
 OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL)         += vdpau_hevc.o h265_profile_level.o
 OBJS-$(CONFIG_MJPEG_NVDEC_HWACCEL)        += nvdec_mjpeg.o
 diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
-index 2231aed2599b..7507966d7160 100644
+index 2231aed2599..7507966d716 100644
 --- a/libavcodec/hevcdec.c
 +++ b/libavcodec/hevcdec.c
@@ -392,6 +392,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
@ -2532,7 +2532,7 @@ index 2231aed2599b..7507966d7160 100644
                                NULL
                            },
 diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
-index 9f8d41e367ed..ffb9fa5087d9 100644
+index 9f8d41e367e..ffb9fa5087d 100644
 --- a/libavcodec/hwaccels.h
 +++ b/libavcodec/hwaccels.h
@@ -40,6 +40,7 @@ extern const AVHWAccel ff_hevc_d3d11va_hwaccel;
@ -2545,10 +2545,10 @@ index 9f8d41e367ed..ffb9fa5087d9 100644
 extern const AVHWAccel ff_hevc_videotoolbox_hwaccel;
 diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
 new file mode 100644
-index 000000000000..3a9d564ce20b
+index 00000000000..fd253661086
 --- /dev/null
 +++ b/libavcodec/v4l2_request_hevc.c
-@@ -0,0 +1,604 @@
+@@ -0,0 +1,580 @@
 +/*
 + * This file is part of FFmpeg.
 + *
@ -2632,32 +2632,6 @@ index 000000000000..3a9d564ce20b
 +    }
 +}
 +
-+static int find_frame_rps_type(const HEVCContext *h, uint64_t timestamp)
-+{
-+    const HEVCFrame *frame;
-+    int i;
-+
-+    for (i = 0; i < h->rps[ST_CURR_BEF].nb_refs; i++) {
-+        frame = h->rps[ST_CURR_BEF].ref[i];
-+        if (frame && timestamp == ff_v4l2_request_get_capture_timestamp(frame->frame))
-+            return V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_BEFORE;
-+    }
-+
-+    for (i = 0; i < h->rps[ST_CURR_AFT].nb_refs; i++) {
-+        frame = h->rps[ST_CURR_AFT].ref[i];
-+        if (frame && timestamp == ff_v4l2_request_get_capture_timestamp(frame->frame))
-+            return V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_AFTER;
-+    }
-+
-+    for (i = 0; i < h->rps[LT_CURR].nb_refs; i++) {
-+        frame = h->rps[LT_CURR].ref[i];
-+        if (frame && timestamp == ff_v4l2_request_get_capture_timestamp(frame->frame))
-+            return V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR;
-+    }
-+
-+    return 0;
-+}
-+
 +static void fill_dec_params(struct v4l2_ctrl_hevc_decode_params *dec_params, const HEVCContext *h)
 +{
 +    const HEVCFrame *pic = h->ref;
@ -2677,8 +2651,10 @@ index 000000000000..3a9d564ce20b
 +            struct v4l2_hevc_dpb_entry *entry = &dec_params->dpb[entries++];
 +
 +            entry->timestamp = ff_v4l2_request_get_capture_timestamp(frame->frame);
-+            entry->rps = find_frame_rps_type(h, entry->timestamp);
 +            entry->field_pic = frame->frame->interlaced_frame;
+            entry->flags = 0;
+            if (frame->flags & HEVC_FRAME_FLAG_LONG_REF)
+                entry->flags |= V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE;
 +
 +            /* TODO: Interleaved: Get the POC for each field. */
 +            entry->pic_order_cnt[0] = frame->poc;
@ -3154,7 +3130,7 @@ index 000000000000..3a9d564ce20b
 +    .caps_internal  = HWACCEL_CAP_ASYNC_SAFE,
 +};

-From 140874637c7d3d99b69e6b30f0ad32b07d4e43e8 Mon Sep 17 00:00:00 2001
+From 3c9c4c99eccdda102064ea67a04c8cbf8083ad1a Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Thu, 12 Dec 2019 16:13:55 +0100
 Subject: [PATCH 09/17] Add V4L2 request API VP9 hwaccel
@ -3173,7 +3149,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
 create mode 100644 libavcodec/v4l2_request_vp9.c

 diff --git a/configure b/configure
-index 02a80cf27fd7..0b238c051dff 100755
+index 02a80cf27fd..0b238c051df 100755
 --- a/configure
 +++ b/configure
@@ -3041,6 +3041,8 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
@ -3194,7 +3170,7 @@ index 02a80cf27fd7..0b238c051dff 100755
 check_headers sys/videoio.h
 test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 0059074530c5..38edf1cfe5e5 100644
+index 0059074530c..38edf1cfe5e 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
@@ -977,6 +977,7 @@ OBJS-$(CONFIG_VP8_VAAPI_HWACCEL)          += vaapi_vp8.o
@ -3206,7 +3182,7 @@ index 0059074530c5..38edf1cfe5e5 100644
 OBJS-$(CONFIG_VP9_VDPAU_HWACCEL)          += vdpau_vp9.o
 OBJS-$(CONFIG_VP8_QSV_HWACCEL)            += qsvdec.o
 diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
-index ffb9fa5087d9..fc5d0b0479be 100644
+index ffb9fa5087d..fc5d0b0479b 100644
 --- a/libavcodec/hwaccels.h
 +++ b/libavcodec/hwaccels.h
@@ -76,6 +76,7 @@ extern const AVHWAccel ff_vp9_d3d11va_hwaccel;
@ -3219,7 +3195,7 @@ index ffb9fa5087d9..fc5d0b0479be 100644
 extern const AVHWAccel ff_wmv3_d3d11va_hwaccel;
 diff --git a/libavcodec/v4l2_request_vp9.c b/libavcodec/v4l2_request_vp9.c
 new file mode 100644
-index 000000000000..9b95c76cdb82
+index 00000000000..9b95c76cdb8
 --- /dev/null
 +++ b/libavcodec/v4l2_request_vp9.c
@@ -0,0 +1,268 @@
@ -3492,7 +3468,7 @@ index 000000000000..9b95c76cdb82
 +    .caps_internal  = HWACCEL_CAP_ASYNC_SAFE,
 +};
 diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
-index 4659f94ee8b6..1b2f1eeaf69c 100644
+index 4659f94ee8b..1b2f1eeaf69 100644
 --- a/libavcodec/vp9.c
 +++ b/libavcodec/vp9.c
@@ -191,6 +191,7 @@ static int update_size(AVCodecContext *avctx, int w, int h)
@ -3761,40 +3737,40 @@ index 4659f94ee8b6..1b2f1eeaf69c 100644
 
         for (i = 0; i < 2; i++) {
 -            if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                s->prob.p.mv_comp[i].sign =
 +            if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                s->prob_raw.p.mv_comp[i].sign =
-+                    (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                 s->prob.p.mv_comp[i].sign =
-                    (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                     (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                s->prob.p.mv_comp[i].sign =
 +                    s->prob_raw.p.mv_comp[i].sign;
 +            }
 
             for (j = 0; j < 10; j++)
 -                if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                    s->prob.p.mv_comp[i].classes[j] =
 +                if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                    s->prob_raw.p.mv_comp[i].classes[j] =
-+                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                     s->prob.p.mv_comp[i].classes[j] =
-                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                         (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                    s->prob.p.mv_comp[i].classes[j] =
 +                        s->prob_raw.p.mv_comp[i].classes[j];
 +                }
 
 -            if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                s->prob.p.mv_comp[i].class0 =
 +            if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                s->prob_raw.p.mv_comp[i].class0 =
-+                    (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                 s->prob.p.mv_comp[i].class0 =
-                    (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                     (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                s->prob.p.mv_comp[i].class0 =
 +                    s->prob_raw.p.mv_comp[i].class0;
 +            }
 
             for (j = 0; j < 10; j++)
 -                if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                    s->prob.p.mv_comp[i].bits[j] =
 +                if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                    s->prob_raw.p.mv_comp[i].bits[j] =
-+                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                     s->prob.p.mv_comp[i].bits[j] =
-                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                         (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                    s->prob.p.mv_comp[i].bits[j] =
 +                        s->prob_raw.p.mv_comp[i].bits[j];
 +                }
         }
@ -3813,11 +3789,11 @@ index 4659f94ee8b6..1b2f1eeaf69c 100644
 
             for (j = 0; j < 3; j++)
 -                if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                    s->prob.p.mv_comp[i].fp[j] =
 +                if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                    s->prob_raw.p.mv_comp[i].fp[j] =
-+                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                     s->prob.p.mv_comp[i].fp[j] =
-                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                         (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                    s->prob.p.mv_comp[i].fp[j] =
 +                        s->prob_raw.p.mv_comp[i].fp[j];
 +                }
         }
@ -3825,20 +3801,20 @@ index 4659f94ee8b6..1b2f1eeaf69c 100644
         if (s->s.h.highprecisionmvs) {
             for (i = 0; i < 2; i++) {
 -                if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                    s->prob.p.mv_comp[i].class0_hp =
 +                if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                    s->prob_raw.p.mv_comp[i].class0_hp =
-+                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                     s->prob.p.mv_comp[i].class0_hp =
-                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                         (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                    s->prob.p.mv_comp[i].class0_hp =
 +                        s->prob_raw.p.mv_comp[i].class0_hp;
 +                }
 
 -                if (vp56_rac_get_prob_branchy(&s->c, 252))
+-                    s->prob.p.mv_comp[i].hp =
 +                if (vp56_rac_get_prob_branchy(&s->c, 252)) {
 +                    s->prob_raw.p.mv_comp[i].hp =
-+                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
-                     s->prob.p.mv_comp[i].hp =
-                        (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                         (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+                    s->prob.p.mv_comp[i].hp =
 +                        s->prob_raw.p.mv_comp[i].hp;
 +                }
             }
@ -3855,7 +3831,7 @@ index 4659f94ee8b6..1b2f1eeaf69c 100644
                                NULL
                            },
 diff --git a/libavcodec/vp9dec.h b/libavcodec/vp9dec.h
-index d82b258a3d81..8d2c341e0b97 100644
+index d82b258a3d8..8d2c341e0b9 100644
 --- a/libavcodec/vp9dec.h
 +++ b/libavcodec/vp9dec.h
@@ -131,6 +131,10 @@ typedef struct VP9Context {
@ -3870,7 +3846,7 @@ index d82b258a3d81..8d2c341e0b97 100644
     // contextual (above) cache
     uint8_t *above_partition_ctx;
 diff --git a/libavcodec/vp9shared.h b/libavcodec/vp9shared.h
-index 54726df742f9..fee3568736f7 100644
+index 54726df742f..fee3568736f 100644
 --- a/libavcodec/vp9shared.h
 +++ b/libavcodec/vp9shared.h
@@ -131,6 +131,7 @@ typedef struct VP9BitstreamHeader {
@ -3882,23 +3858,23 @@ index 54726df742f9..fee3568736f7 100644
         uint8_t pred_prob[3];
         struct {

-From ae118fbbef1e287c5101d7ceaa164727d825c4c2 Mon Sep 17 00:00:00 2001
+From 3d23a6cb94067e5c2529955551d6a8fcc8e48acd Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Thu, 14 Feb 2019 23:20:05 +0100
-Subject: [PATCH 10/17] Add and use private linux v5.16 headers for V4L2
+Subject: [PATCH 10/17] Add and use private linux v5.18 headers for V4L2
 request API ctrls

 Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 ---
 configure                      |   2 +-
- libavcodec/hevc-ctrls.h        | 252 +++++++++++++++++++++++++++++++++
+ libavcodec/hevc-ctrls.h        | 250 +++++++++++++++++++++++++++++++++
 libavcodec/v4l2_request_hevc.c |   1 +
- 3 files changed, 254 insertions(+), 1 deletion(-)
+ 3 files changed, 252 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/hevc-ctrls.h

 diff --git a/configure b/configure
-index 0b238c051dff..1c1929d2c28f 100755
+index 0b238c051df..1c1929d2c28 100755
 --- a/configure
 +++ b/configure
@@ -2967,7 +2967,7 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
@ -3912,10 +3888,10 @@ index 0b238c051dff..1c1929d2c28f 100755
 hevc_vaapi_hwaccel_select="hevc_decoder"
 diff --git a/libavcodec/hevc-ctrls.h b/libavcodec/hevc-ctrls.h
 new file mode 100644
-index 000000000000..ef63bc205756
+index 00000000000..01ccda48d8c
 --- /dev/null
 +++ b/libavcodec/hevc-ctrls.h
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,250 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * These are the HEVC state controls for use with stateless HEVC
@ -4045,15 +4021,13 @@ index 000000000000..ef63bc205756
 +	__u64	flags;
 +};
 +
-+#define V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_BEFORE	0x01
-+#define V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_AFTER	0x02
-+#define V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR		0x03
+#define V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE	0x01
 +
 +#define V4L2_HEVC_DPB_ENTRIES_NUM_MAX		16
 +
 +struct v4l2_hevc_dpb_entry {
 +	__u64	timestamp;
-+	__u8	rps;
+	__u8	flags;
 +	__u8	field_pic;
 +	__u16	pic_order_cnt[2];
 +	__u8	padding[2];
@ -4169,7 +4143,7 @@ index 000000000000..ef63bc205756
 +
 +#endif
 diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
-index 3a9d564ce20b..f645c538c25c 100644
+index fd253661086..949df3811ac 100644
 --- a/libavcodec/v4l2_request_hevc.c
 +++ b/libavcodec/v4l2_request_hevc.c
@@ -19,6 +19,7 @@
@ -4181,7 +4155,7 @@ index 3a9d564ce20b..f645c538c25c 100644
 #define MAX_SLICES 16
 

-From afe6727d8c300c77a72549b4e094910f09242a42 Mon Sep 17 00:00:00 2001
+From bb3cf90c0533a0096dff74b416f55832814293e0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 29 Apr 2019 22:08:59 +0000
 Subject: [PATCH 11/17] HACK: hwcontext_drm: do not require drm device
@ -4192,7 +4166,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 1 file changed, 5 insertions(+)

 diff --git a/libavutil/hwcontext_drm.c b/libavutil/hwcontext_drm.c
-index 7a9fdbd263d4..6297d1f9b613 100644
+index 7a9fdbd263d..6297d1f9b61 100644
 --- a/libavutil/hwcontext_drm.c
 +++ b/libavutil/hwcontext_drm.c
@@ -53,6 +53,11 @@ static int drm_device_create(AVHWDeviceContext *hwdev, const char *device,
@ -4208,7 +4182,7 @@ index 7a9fdbd263d4..6297d1f9b613 100644
     if (hwctx->fd < 0)
         return AVERROR(errno);

-From bcad5ac25923b3d2395edceca821129c00b57b9e Mon Sep 17 00:00:00 2001
+From 0a9c478c1e826eb1ecff27da1206542614449de5 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 15 Dec 2018 22:32:16 +0100
 Subject: [PATCH 12/17] WIP: hevc entry point offsets
@ -4220,10 +4194,10 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 2 files changed, 12 insertions(+), 1 deletion(-)

 diff --git a/libavcodec/hevc-ctrls.h b/libavcodec/hevc-ctrls.h
-index ef63bc205756..a24916603017 100644
+index 01ccda48d8c..00bae349d34 100644
 --- a/libavcodec/hevc-ctrls.h
 +++ b/libavcodec/hevc-ctrls.h
-@@ -202,7 +202,9 @@ struct v4l2_ctrl_hevc_slice_params {
+@@ -200,7 +200,9 @@ struct v4l2_ctrl_hevc_slice_params {
 	__u8	ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 	__u8	ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 
@ -4235,10 +4209,10 @@ index ef63bc205756..a24916603017 100644
 	/* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */
 	struct v4l2_hevc_pred_weight_table pred_weight_table;
 diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
-index f645c538c25c..601202a77d7a 100644
+index 949df3811ac..b74244f3be6 100644
 --- a/libavcodec/v4l2_request_hevc.c
 +++ b/libavcodec/v4l2_request_hevc.c
-@@ -256,6 +256,15 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
+@@ -232,6 +232,15 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
     }
 
     v4l2_request_hevc_fill_pred_table(h, &slice_params->pred_weight_table);
@ -4255,7 +4229,7 @@ index f645c538c25c..601202a77d7a 100644
 
 static void fill_sps(struct v4l2_ctrl_hevc_sps *ctrl, const HEVCContext *h)

-From 694b79d528295ae4d073c5972d35173116ff2b69 Mon Sep 17 00:00:00 2001
+From 154405d2d8987c741e722f59430fda9326c8cdef Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 15 May 2020 16:54:05 +0000
 Subject: [PATCH 13/17] WIP: add NV15 and NV20 support
@ -4267,7 +4241,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 2 files changed, 35 insertions(+), 2 deletions(-)

 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
-index 0a10d00aad9e..45057fd049bd 100644
+index 0a10d00aad9..45057fd049b 100644
 --- a/libavcodec/h264_slice.c
 +++ b/libavcodec/h264_slice.c
@@ -794,10 +794,17 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -4301,7 +4275,7 @@ index 0a10d00aad9e..45057fd049bd 100644
                 *fmt++ = AV_PIX_FMT_YUVJ422P;
             else
 diff --git a/libavcodec/v4l2_request.c b/libavcodec/v4l2_request.c
-index 5234b5049b0d..0b294feff2eb 100644
+index 5234b5049b0..0b294feff2e 100644
 --- a/libavcodec/v4l2_request.c
 +++ b/libavcodec/v4l2_request.c
@@ -188,6 +188,13 @@ const uint32_t v4l2_request_capture_pixelformats[] = {
@ -4342,7 +4316,7 @@ index 5234b5049b0d..0b294feff2eb 100644
     default:
         return -1;

-From dd29c8e4b504f12be27db8e188ba5bbaade7559f Mon Sep 17 00:00:00 2001
+From d7933e19a712a59af418f6b029c0984d5b29afe9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 27 Jul 2020 23:15:45 +0000
 Subject: [PATCH 14/17] HACK: define drm NV15 and NV20 format
@ -4352,7 +4326,7 @@ Subject: [PATCH 14/17] HACK: define drm NV15 and NV20 format
 1 file changed, 8 insertions(+)

 diff --git a/libavcodec/v4l2_request.c b/libavcodec/v4l2_request.c
-index 0b294feff2eb..a8f0ee79eeef 100644
+index 0b294feff2e..a8f0ee79eee 100644
 --- a/libavcodec/v4l2_request.c
 +++ b/libavcodec/v4l2_request.c
@@ -30,6 +30,14 @@
@ -4371,7 +4345,7 @@ index 0b294feff2eb..a8f0ee79eeef 100644
 {
     V4L2RequestDescriptor *req = (V4L2RequestDescriptor*)frame->data[0];

-From 0d56f3e7b04a5d574d38dd885000a6eb19eff903 Mon Sep 17 00:00:00 2001
+From 7ebf970204f1aaabc3d0ca0c81d8d4dd99916c56 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 13 May 2020 22:51:21 +0000
 Subject: [PATCH 15/17] WIP: hevc rkvdec fields
@ -4383,7 +4357,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 2 files changed, 22 insertions(+), 1 deletion(-)

 diff --git a/libavcodec/hevc-ctrls.h b/libavcodec/hevc-ctrls.h
-index a24916603017..cd143526685f 100644
+index 00bae349d34..2ecec618669 100644
 --- a/libavcodec/hevc-ctrls.h
 +++ b/libavcodec/hevc-ctrls.h
@@ -58,6 +58,8 @@ enum v4l2_mpeg_video_hevc_start_code {
@ -4422,7 +4396,7 @@ index a24916603017..cd143526685f 100644
 	__u64	flags;
 };
 
-@@ -202,6 +208,9 @@ struct v4l2_ctrl_hevc_slice_params {
+@@ -200,6 +206,9 @@ struct v4l2_ctrl_hevc_slice_params {
 	__u8	ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 	__u8	ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 
@ -4433,10 +4407,10 @@ index a24916603017..cd143526685f 100644
 	__u32	entry_point_offset_minus1[256];
 	__u8	padding[8];
 diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
-index 601202a77d7a..be7838244447 100644
+index b74244f3be6..093700c4063 100644
 --- a/libavcodec/v4l2_request_hevc.c
 +++ b/libavcodec/v4l2_request_hevc.c
-@@ -214,6 +214,9 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
+@@ -190,6 +190,9 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
 
         /* ISO/IEC 23008-2, ITU-T Rec. H.265: Picture timing SEI message */
         .pic_struct = h->sei.picture_timing.picture_struct,
@ -4446,7 +4420,7 @@ index 601202a77d7a..be7838244447 100644
     };
 
     if (sh->slice_sample_adaptive_offset_flag[0])
-@@ -270,9 +273,12 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
+@@ -246,9 +249,12 @@ static void v4l2_request_hevc_fill_slice_params(const HEVCContext *h,
 static void fill_sps(struct v4l2_ctrl_hevc_sps *ctrl, const HEVCContext *h)
 {
     const HEVCSPS *sps = h->ps.sps;
@ -4459,7 +4433,7 @@ index 601202a77d7a..be7838244447 100644
         .pic_width_in_luma_samples = sps->width,
         .pic_height_in_luma_samples = sps->height,
         .bit_depth_luma_minus8 = sps->bit_depth - 8,
-@@ -336,6 +342,7 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
+@@ -312,6 +318,7 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
                             &pps->scaling_list :
                             sps->scaling_list_enable_flag ?
                             &sps->scaling_list : NULL;
@ -4467,7 +4441,7 @@ index 601202a77d7a..be7838244447 100644
     V4L2RequestControlsHEVC *controls = h->ref->hwaccel_picture_private;
 
     fill_sps(&controls->sps, h);
-@@ -359,6 +366,9 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
+@@ -335,6 +342,9 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
 
     /* ISO/IEC 23008-2, ITU-T Rec. H.265: Picture parameter set */
     controls->pps = (struct v4l2_ctrl_hevc_pps) {
@ -4477,7 +4451,7 @@ index 601202a77d7a..be7838244447 100644
         .num_extra_slice_header_bits = pps->num_extra_slice_header_bits,
         .num_ref_idx_l0_default_active_minus1 = pps->num_ref_idx_l0_default_active - 1,
         .num_ref_idx_l1_default_active_minus1 = pps->num_ref_idx_l1_default_active - 1,
-@@ -488,6 +498,8 @@ static int v4l2_request_hevc_queue_decode(AVCodecContext *avctx, int last_slice)
+@@ -464,6 +474,8 @@ static int v4l2_request_hevc_queue_decode(AVCodecContext *avctx, int last_slice)
     if (ctx->decode_mode == V4L2_MPEG_VIDEO_HEVC_DECODE_MODE_SLICE_BASED)
         return ff_v4l2_request_decode_slice(avctx, h->ref->frame, control, FF_ARRAY_ELEMS(control), controls->first_slice, last_slice);
 
@ -4487,7 +4461,7 @@ index 601202a77d7a..be7838244447 100644
 }
 

-From eb9a3213d56d9f6a177f16e907f57e0063b23244 Mon Sep 17 00:00:00 2001
+From c9ae9a29ef84096bb2e4d37fbdea6c3b3d20fff7 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sun, 19 Sep 2021 13:10:55 +0200
 Subject: [PATCH 16/17] v4l2_request: validate supported framesizes
@ -4498,7 +4472,7 @@ Signed-off-by: Alex Bee <knaerzche@gmail.com>
 1 file changed, 37 insertions(+), 1 deletion(-)

 diff --git a/libavcodec/v4l2_request.c b/libavcodec/v4l2_request.c
-index a8f0ee79eeef..2fbe16634160 100644
+index a8f0ee79eee..2fbe1663416 100644
 --- a/libavcodec/v4l2_request.c
 +++ b/libavcodec/v4l2_request.c
@@ -376,6 +376,42 @@ int ff_v4l2_request_decode_frame(AVCodecContext *avctx, AVFrame *frame, struct v
@ -4554,7 +4528,7 @@ index a8f0ee79eeef..2fbe16634160 100644
         fmtdesc.index++;
     }

-From 5607e918e68f9eb3280914b04e93ebff766e9e02 Mon Sep 17 00:00:00 2001
+From c415926540fe04141bb1e8cabd24049b61752d4f Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@gmail.com>
 Date: Sun, 27 Feb 2022 18:54:21 +0100
 Subject: [PATCH 17/17] Improve VP9 decoding
@ -4564,7 +4538,7 @@ Subject: [PATCH 17/17] Improve VP9 decoding
 1 file changed, 62 insertions(+), 48 deletions(-)

 diff --git a/libavcodec/v4l2_request_vp9.c b/libavcodec/v4l2_request_vp9.c
-index 9b95c76cdb82..ec0300f66dbe 100644
+index 9b95c76cdb8..ec0300f66db 100644
 --- a/libavcodec/v4l2_request_vp9.c
 +++ b/libavcodec/v4l2_request_vp9.c
@@ -22,78 +22,62 @@
--- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-100.10-kernel-5.18.patch
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-100.10-kernel-5.18.patch
@ -0,0 +1,64 @@
+diff -Nur a/kernel/nv-vm.c b/kernel/nv-vm.c
+--- a/kernel/nv-vm.c	2019-12-11 22:04:24.000000000 +0000
+++ b/kernel/nv-vm.c	2022-04-25 01:28:55.889120175 +0000
+@@ -169,12 +169,12 @@
+ 
+ static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
+ {
+-    return pci_map_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
+    return dma_map_sg(&dev->dev, sg, 1, DMA_BIDIRECTIONAL);
+ }
+ 
+ static inline void nv_unmap_sg(struct pci_dev *dev, struct scatterlist *sg)
+ {
+-    pci_unmap_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
+    dma_unmap_sg(&dev->dev, sg, 1, DMA_BIDIRECTIONAL);
+ }
+ 
+ #define NV_MAP_SG_MAX_RETRIES 16
+--- a/kernel/nv-dma.c	2019-12-11 22:04:24.000000000 +0000
+++ b/kernel/nv-dma.c	2022-04-25 01:52:11.243235749 +0000
+@@ -136,10 +136,10 @@
+         return status;
+     }
+ 
+-    dma_map->sg_map_count = pci_map_sg(dma_map->dev,
+    dma_map->sg_map_count = dma_map_sg(&dma_map->dev->dev,
+             NV_DMA_MAP_SCATTERLIST(dma_map),
+             NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map),
+-            PCI_DMA_BIDIRECTIONAL);
+            DMA_BIDIRECTIONAL);
+     if (dma_map->sg_map_count == 0)
+     {
+         nv_printf(NV_DBG_ERRORS,
+@@ -211,8 +211,8 @@
+ 
+     if (dma_map->sg_map_count != 0)
+     {
+-        pci_unmap_sg(dma_map->dev, NV_DMA_MAP_SCATTERLIST(dma_map),
+-                NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map), PCI_DMA_BIDIRECTIONAL);
+        dma_unmap_sg(&dma_map->dev->dev, NV_DMA_MAP_SCATTERLIST(dma_map),
+                NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map), DMA_BIDIRECTIONAL);
+     }
+ 
+     *priv = dma_map->user_pages;
+--- a/kernel/nv-drm.c	2022-04-25 01:59:40.255544206 +0000
+++ b/kernel/nv-drm.c	2022-04-25 02:08:28.231217905 +0000
+@@ -459,7 +459,7 @@
+ }
+ 
+ static int nv_drm_gem_vmap(struct drm_gem_object *gem,
+-                           struct dma_buf_map *map)
+                           struct iosys_map *map)
+ {
+     map->vaddr = nv_gem_prime_vmap(gem);
+     if (map->vaddr == NULL) {
+@@ -470,7 +470,7 @@
+ }
+ 
+ static void nv_drm_gem_vunmap(struct drm_gem_object *gem,
+-                              struct dma_buf_map *map)
+                              struct iosys_map *map)
+ {
+     nv_gem_prime_vunmap(gem, map->vaddr);
+     map->vaddr = NULL;
--- a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.18.patch
+++ b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.18.patch
@ -0,0 +1,289 @@
+From 0ec02378bcc0d35d713fd93ba42c3848bc8b1077 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sat, 12 Mar 2022 08:37:32 +0100
+Subject: [PATCH 1/2] Buildfix NVIDIA 470.103.01 for Linux 5.18-rc1 (part 1)
+
+---
+ common/inc/nv-linux.h       | 7 +++++++
+ nvidia-drm/nvidia-drm-drv.c | 4 ++++
+ nvidia-drm/nvidia-drm-gem.c | 6 ++++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 82e19d6..58e66c7 100644
+--- a/kernel/common/inc/nv-linux.h
+++ b/kernel/common/inc/nv-linux.h
+@@ -11,6 +11,8 @@
+ #ifndef _NV_LINUX_H_
+ #define _NV_LINUX_H_
+ 
+#warning Do not buy NVIDIA for your next GPU!
+#include <linux/version.h>
+ #include "nvstatus.h"
+ #include "nv.h"
+ #include "nv-ioctl-numa.h"
+@@ -958,7 +960,12 @@ static inline pgprot_t nv_adjust_pgprot(pgprot_t vm_prot, NvU32 extra)
+      * When AMD memory encryption is enabled, device memory mappings with the
+      * C-bit set read as 0xFF, so ensure the bit is cleared for user mappings.
+      */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) && defined(_ASM_X86_PGTABLE_H))
+    // Rel. commit "x86/coco: Add API to handle encryption mask" (Kirill A. Shutemov, 22 Feb 2022)
+    prot = __pgprot(__sme_clr(pgprot_val(prot)));
+#else
+     prot = pgprot_decrypted(prot);
+#endif
+ #endif
+     return prot;
+ }
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index d7067a4..f57cbc8 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
+#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
+ 
+ #include "nvidia-drm-priv.h"
+@@ -254,7 +255,10 @@ nv_drm_init_mode_config(struct nv_drm_device *nv_dev,
+ #if defined(NV_DRM_FORMAT_MODIFIERS_PRESENT)
+     /* Allow clients to define framebuffer layouts using DRM format modifiers */
+ 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0))
+    // Rel. commit "drm: remove allow_fb_modifiers" (Tomohito Esaki, 28 Jan 2022)
+     dev->mode_config.allow_fb_modifiers = true;
+#endif
+ #endif
+ 
+     /* Initialize output polling support */
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
+index 82de645..8cd3f76 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -49,6 +49,12 @@
+ 
+ #include "nv-mm.h"
+ 
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
+// Rel. commit "dma-buf-map: Rename to iosys-map" (Lucas De Marchi, 4 Feb 2022)
+#define dma_buf_map iosys_map
+#endif
+
+ void nv_drm_gem_free(struct drm_gem_object *gem)
+ {
+     struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
+-- 
+2.35.1
+
+
+From 6b934e829fb942d1735e2371320ddbec089c6900 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Mon, 4 Apr 2022 19:59:51 +0200
+Subject: [PATCH 2/2] Buildfix NVIDIA 470.103.01 for Linux 5.18-rc1 (part 2)
+
+See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d56baf6efaf14e2910610216c581ca71d6940012
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7968778914e53788a01c2dee2692cab157de9ac0
+---
+ nvidia-uvm/uvm_gpu.c    |  8 ++++----
+ nvidia/linux_nvswitch.c | 18 +++++++++---------
+ nvidia/nv.c             | 18 +++++++++---------
+ 3 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/kernel/nvidia-uvm/uvm_gpu.c b/kernel/nvidia-uvm/uvm_gpu.c
+index f58c00b..c9607a8 100644
+--- a/kernel/nvidia-uvm/uvm_gpu.c
+++ b/kernel/nvidia-uvm/uvm_gpu.c
+@@ -3059,16 +3059,16 @@ out:
+ 
+ NV_STATUS uvm_gpu_map_cpu_pages(uvm_gpu_t *gpu, struct page *page, size_t size, NvU64 *dma_addr_out)
+ {
+-    NvU64 dma_addr = pci_map_page(gpu->parent->pci_dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
+    NvU64 dma_addr = dma_map_page(&gpu->parent->pci_dev->dev, page, 0, size, DMA_BIDIRECTIONAL);
+ 
+     UVM_ASSERT(PAGE_ALIGNED(size));
+ 
+-    if (pci_dma_mapping_error(gpu->parent->pci_dev, dma_addr))
+    if (dma_mapping_error(&gpu->parent->pci_dev->dev, dma_addr))
+         return NV_ERR_OPERATING_SYSTEM;
+ 
+     if (dma_addr < gpu->parent->dma_addressable_start ||
+         dma_addr + size - 1 > gpu->parent->dma_addressable_limit) {
+-        pci_unmap_page(gpu->parent->pci_dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
+        dma_unmap_page(&gpu->parent->pci_dev->dev, dma_addr, size, DMA_BIDIRECTIONAL);
+         UVM_ERR_PRINT_RL("PCI mapped range [0x%llx, 0x%llx) not in the addressable range [0x%llx, 0x%llx), GPU %s\n",
+                          dma_addr,
+                          dma_addr + (NvU64)size,
+@@ -3102,7 +3102,7 @@ void uvm_gpu_unmap_cpu_pages(uvm_gpu_t *gpu, NvU64 dma_address, size_t size)
+     if (gpu->parent->npu)
+         dma_address = nv_expand_nvlink_addr(dma_address);
+     dma_address += gpu->parent->dma_addressable_start;
+-    pci_unmap_page(gpu->parent->pci_dev, dma_address, size, PCI_DMA_BIDIRECTIONAL);
+    dma_unmap_page(&gpu->parent->pci_dev->dev, dma_address, size, DMA_BIDIRECTIONAL);
+     atomic64_sub(size, &gpu->parent->mapped_cpu_pages_size);
+ }
+ 
+diff --git a/kernel/nvidia/linux_nvswitch.c b/kernel/nvidia/linux_nvswitch.c
+index ddfc53c..714b9eb 100644
+--- a/kernel/nvidia/linux_nvswitch.c
+++ b/kernel/nvidia/linux_nvswitch.c
+@@ -2139,11 +2139,11 @@ _nvswitch_to_pci_dma_direction
+ )
+ {
+     if (direction == NVSWITCH_DMA_DIR_TO_SYSMEM)
+-        return PCI_DMA_FROMDEVICE;
+        return DMA_FROM_DEVICE;
+     else if (direction == NVSWITCH_DMA_DIR_FROM_SYSMEM)
+-        return PCI_DMA_TODEVICE;
+        return DMA_TO_DEVICE;
+     else
+-        return PCI_DMA_BIDIRECTIONAL;
+        return DMA_BIDIRECTIONAL;
+ }
+ 
+ NvlStatus
+@@ -2164,9 +2164,9 @@ nvswitch_os_map_dma_region
+ 
+     dma_dir = _nvswitch_to_pci_dma_direction(direction);
+ 
+-    *dma_handle = (NvU64)pci_map_single(pdev, cpu_addr, size, dma_dir);
+    *dma_handle = (NvU64) dma_map_single(&pdev->dev, cpu_addr, size, dma_dir);
+ 
+-    if (pci_dma_mapping_error(pdev, *dma_handle))
+    if (dma_mapping_error(&pdev->dev, *dma_handle))
+     {
+         pr_err("nvidia-nvswitch: unable to create PCI DMA mapping\n");
+         return -NVL_ERR_GENERIC;
+@@ -2193,7 +2193,7 @@ nvswitch_os_unmap_dma_region
+ 
+     dma_dir = _nvswitch_to_pci_dma_direction(direction);
+ 
+-    pci_unmap_single(pdev, dma_handle, size, dma_dir);
+    dma_unmap_single(&pdev->dev, dma_handle, size, dma_dir);
+ 
+     return NVL_SUCCESS;
+ }
+@@ -2210,7 +2210,7 @@ nvswitch_os_set_dma_mask
+     if (!pdev)
+         return -NVL_BAD_ARGS;
+ 
+-    if (pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_addr_width)))
+    if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(dma_addr_width)))
+         return -NVL_ERR_GENERIC;
+ 
+     return NVL_SUCCESS;
+@@ -2233,7 +2233,7 @@ nvswitch_os_sync_dma_region_for_cpu
+ 
+     dma_dir = _nvswitch_to_pci_dma_direction(direction);
+ 
+-    pci_dma_sync_single_for_cpu(pdev, dma_handle, size, dma_dir);
+    dma_sync_single_for_cpu(&pdev->dev, dma_handle, size, dma_dir);
+ 
+     return NVL_SUCCESS;
+ }
+@@ -2255,7 +2255,7 @@ nvswitch_os_sync_dma_region_for_device
+ 
+     dma_dir = _nvswitch_to_pci_dma_direction(direction);
+ 
+-    pci_dma_sync_single_for_device(pdev, dma_handle, size, dma_dir);
+    dma_sync_single_for_device(&pdev->dev, dma_handle, size, dma_dir);
+ 
+     return NVL_SUCCESS;
+ }
+diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
+index 92a7dc6..5065158 100644
+--- a/kernel/nvidia/nv.c
+++ b/kernel/nvidia/nv.c
+@@ -2821,13 +2821,13 @@ nv_set_dma_address_size(
+      */
+     if (!nvl->tce_bypass_enabled)
+     {
+-        pci_set_dma_mask(nvl->pci_dev, new_mask);
+        dma_set_mask(&nvl->pci_dev->dev, new_mask);
+         /* Certain kernels have a bug which causes pci_set_consistent_dma_mask
+          * to call GPL sme_active symbol, this bug has already been fixed in a
+          * minor release update but detect the failure scenario here to prevent
+          * an installation regression */
+ #if !NV_IS_EXPORT_SYMBOL_GPL_sme_active
+-        pci_set_consistent_dma_mask(nvl->pci_dev, new_mask);
+        dma_set_coherent_mask(&nvl->pci_dev->dev, new_mask);
+ #endif
+     }
+ }
+@@ -4524,19 +4524,19 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
+      * as the starting address for all DMA mappings.
+      */
+     saved_dma_mask = pci_dev->dma_mask;
+-    if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64)) != 0)
+    if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64)) != 0)
+     {
+         goto done;
+     }
+ 
+-    dma_addr = pci_map_single(pci_dev, NULL, 1, DMA_BIDIRECTIONAL);
+-    if (pci_dma_mapping_error(pci_dev, dma_addr))
+    dma_addr = dma_map_single(&pci_dev->dev, NULL, 1, DMA_BIDIRECTIONAL);
+    if (dma_mapping_error(&pci_dev->dev, dma_addr))
+     {
+-        pci_set_dma_mask(pci_dev, saved_dma_mask);
+        dma_set_mask(&pci_dev->dev, saved_dma_mask);
+         goto done;
+     }
+ 
+-    pci_unmap_single(pci_dev, dma_addr, 1, DMA_BIDIRECTIONAL);
+    dma_unmap_single(&pci_dev->dev, dma_addr, 1, DMA_BIDIRECTIONAL);
+ 
+     /*
+      * From IBM: "For IODA2, native DMA bypass or KVM TCE-based implementation
+@@ -4568,7 +4568,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
+          */
+         nv_printf(NV_DBG_WARNINGS,
+             "NVRM: DMA window limited by platform\n");
+-        pci_set_dma_mask(pci_dev, saved_dma_mask);
+        dma_set_mask(&pci_dev->dev, saved_dma_mask);
+         goto done;
+     }
+     else if ((dma_addr & saved_dma_mask) != 0)
+@@ -4587,7 +4587,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
+              */
+             nv_printf(NV_DBG_WARNINGS,
+                 "NVRM: DMA window limited by memory size\n");
+-            pci_set_dma_mask(pci_dev, saved_dma_mask);
+            dma_set_mask(&pci_dev->dev, saved_dma_mask);
+             goto done;
+         }
+     }
+-- 
+2.35.1
+
+
+From 689ede6109d1b8aef914809f290e75632c338b9f Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sat, 9 Apr 2022 19:42:24 +0200
+Subject: [PATCH] Buildfix NVIDIA 470.103.01 for Linux 5.18-rc2
+
+acpi_bus_get_device was removed and its trivial replacement acpi_fetch_acpi_dev
+is GPL-exported, so just disable ACPI support as I don't want to deal with it.
+---
+ nvidia/nv-acpi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c
+index faf8b44..22a9152 100644
+--- a/kernel/nvidia/nv-acpi.c
+++ b/kernel/nvidia/nv-acpi.c
+@@ -16,7 +16,8 @@
+ 
+ #include <linux/acpi.h>
+ 
+-#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
+#include <linux/version.h>
+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0))
+ static NV_STATUS   nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
+ static NV_STATUS   nv_acpi_extract_buffer  (const union acpi_object *, void *, NvU32, NvU32 *);
+ static NV_STATUS   nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *);
+-- 
+2.35.1
+
--- a/projects/Allwinner/linux/linux.aarch64.conf
+++ b/projects/Allwinner/linux/linux.aarch64.conf
--- a/projects/Allwinner/linux/linux.arm.conf
+++ b/projects/Allwinner/linux/linux.arm.conf
--- a/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch
+++ b/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch
@ -5,7 +5,7 @@ Subject: [PATCH 40/44] wip: H6 deinterlace

 Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 ---
- drivers/media/platform/Kconfig                |   13 +
+ .../media/platform/sunxi/sunxi50i-di/Kconfig  |   14 +
 drivers/media/platform/sunxi/Makefile         |    1 +
 .../media/platform/sunxi/sun50i-di/Makefile   |    2 +
 .../platform/sunxi/sun50i-di/sun50i-di.c      | 1134 +++++++++++++++++
@ -15,15 +15,14 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 create mode 100644 drivers/media/platform/sunxi/sun50i-di/sun50i-di.c
 create mode 100644 drivers/media/platform/sunxi/sun50i-di/sun50i-di.h

--- a/drivers/media/platform/Kconfig
-+++ b/drivers/media/platform/Kconfig
-@@ -574,6 +574,19 @@ config VIDEO_QCOM_VENUS
- 	  on various Qualcomm SoCs.
- 	  To compile this driver as a module choose m here.
- 
+--- /dev/null
+++ b/drivers/media/platform/sunxi/sun50i-di/Kconfig
+@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
 +config VIDEO_SUN50I_DEINTERLACE
 +	tristate "Allwinner Deinterlace v2 driver"
-+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV
 +	depends on ARCH_SUNXI || COMPILE_TEST
 +	depends on COMMON_CLK && OF
 +	depends on PM
@ -33,10 +32,6 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +	   Support for the Allwinner deinterlace v2 unit found on
 +	   some SoCs, like H6.
 +	   To compile this driver as a module choose m here.
-+
- config VIDEO_SUN8I_DEINTERLACE
- 	tristate "Allwinner Deinterlace driver"
- 	depends on VIDEO_DEV && VIDEO_V4L2
 --- a/drivers/media/platform/sunxi/Makefile
 +++ b/drivers/media/platform/sunxi/Makefile
@@ -3,4 +3,5 @@
@ -1362,3 +1357,11 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +};
 +
 +#endif
+--- a/drivers/media/platform/sunxi/Kconfig	2022-04-17 20:57:31.000000000 +0000
+++ b/drivers/media/platform/sunxi/Kconfig	2022-04-23 13:22:19.652398021 +0000
+@@ -5,4 +5,5 @@
+ source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
+ source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
+ source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
+source "drivers/media/platform/sunxi/sun50i-di/Kconfig"
+ source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
--- a/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch
+++ b/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch
@ -18,10 +18,10 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
@@ -116,16 +116,16 @@
 
 #define SUN8I_I2S_CHAN_CFG_REG		0x30
- #define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK	GENMASK(6, 4)
+ #define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK	GENMASK(7, 4)
 -#define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(chan)	((chan - 1) << 4)
 +#define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(chan)	(((chan) - 1) << 4)
- #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK	GENMASK(2, 0)
+ #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK	GENMASK(3, 0)
 -#define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(chan)	(chan - 1)
 +#define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(chan)	((chan) - 1)
 
--- a/projects/Allwinner/patches/linux/0033-WIP-I2S-multi-channel.patch
+++ b/projects/Allwinner/patches/linux/0033-WIP-I2S-multi-channel.patch
@ -20,7 +20,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 #define SUN4I_I2S_CTRL_MODE_SLAVE			(1 << 5)
 #define SUN4I_I2S_CTRL_MODE_MASTER			(0 << 5)
@@ -120,8 +120,8 @@
- #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK	GENMASK(2, 0)
+ #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK	GENMASK(3, 0)
 #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(chan)	((chan) - 1)
 
 -#define SUN8I_I2S_TX_CHAN_MAP_REG	0x44
@ -30,18 +30,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 #define SUN8I_I2S_TX_CHAN_OFFSET_MASK		GENMASK(13, 12)
 #define SUN8I_I2S_TX_CHAN_OFFSET(offset)	((offset) << 12)
 #define SUN8I_I2S_TX_CHAN_EN_MASK		GENMASK(11, 4)
-@@ -138,8 +138,8 @@
- #define SUN50I_H6_I2S_TX_CHAN_EN_MASK		GENMASK(15, 0)
- #define SUN50I_H6_I2S_TX_CHAN_EN(num_chan)	(((1 << (num_chan)) - 1))
- 
-#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG	0x44
-#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG	0x48
-+#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG(i)	(0x44 + 8 * (i))
-+#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG(i)	(0x48 + 8 * (i))
- 
- #define SUN50I_H6_I2S_RX_CHAN_SEL_REG	0x64
- #define SUN50I_H6_I2S_RX_CHAN_MAP0_REG	0x68
-@@ -189,7 +189,7 @@ struct sun4i_i2s_quirks {
+@@ -198,7 +198,7 @@ struct sun4i_i2s_quirks {
 	 * @slots: channels per frame + padding slots, regardless of format
 	 * @slot_width: bits per sample + padding bits, regardless of format
 	 */
@ -50,7 +39,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 				unsigned int channels,	unsigned int slots,
 				unsigned int slot_width);
 	int	(*set_fmt)(const struct sun4i_i2s *i2s, unsigned int fmt);
-@@ -205,6 +205,7 @@ struct sun4i_i2s {
+@@ -214,6 +214,7 @@ struct sun4i_i2s {
 	unsigned int	mclk_freq;
 	unsigned int	slots;
 	unsigned int	slot_width;
@ -58,7 +47,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 
 	struct snd_dmaengine_dai_dma_data	capture_dma_data;
 	struct snd_dmaengine_dai_dma_data	playback_dma_data;
-@@ -445,7 +446,7 @@ static int sun8i_i2s_get_sr_wss(unsigned
+@@ -454,7 +455,7 @@ static int sun8i_i2s_get_sr_wss(unsigned
 	return -EINVAL;
 }
 
@ -67,7 +56,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 				  unsigned int channels, unsigned int slots,
 				  unsigned int slot_width)
 {
-@@ -464,20 +465,42 @@ static int sun4i_i2s_set_chan_cfg(const
+@@ -473,20 +474,42 @@ static int sun4i_i2s_set_chan_cfg(const
 	return 0;
 }
 
@ -116,7 +105,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	regmap_update_bits(i2s->regmap, SUN8I_I2S_RX_CHAN_SEL_REG,
 			   SUN4I_I2S_CHAN_SEL_MASK,
 			   SUN4I_I2S_CHAN_SEL(channels));
-@@ -509,29 +532,47 @@ static int sun8i_i2s_set_chan_cfg(const
+@@ -518,36 +541,54 @@ static int sun8i_i2s_set_chan_cfg(const
 			   SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
 			   SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
 
@ -144,18 +133,23 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +			   SUN4I_I2S_CTRL_SDO_EN(i2s->lines));
 
 	/* Map the channels for playback and capture */
-	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0xFEDCBA98);
-	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210);
-+	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP0_REG(0), 0xFEDCBA98);
-+	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG(0), 0x76543210);
+ 	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP0_REG(0), 0xFEDCBA98);
+ 	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG(0), 0x76543210);
 +	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG(1), 0x32);
 +	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG(2), 0x54);
 +	regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG(3), 0x76);
- 	regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0xFEDCBA98);
- 	regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
+ 	if (i2s->variant->num_din_pins > 1) {
+ 		regmap_write(i2s->regmap, SUN50I_R329_I2S_RX_CHAN_MAP0_REG, 0x0F0E0D0C);
+ 		regmap_write(i2s->regmap, SUN50I_R329_I2S_RX_CHAN_MAP1_REG, 0x0B0A0908);
+ 		regmap_write(i2s->regmap, SUN50I_R329_I2S_RX_CHAN_MAP2_REG, 0x07060504);
+ 		regmap_write(i2s->regmap, SUN50I_R329_I2S_RX_CHAN_MAP3_REG, 0x03020100);
+ 	} else {
+ 		regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0xFEDCBA98);
+ 		regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
+ 	}
 
 	/* Configure the channels */
-	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+-	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_SEL_REG(0),
 -			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
 -			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
 +	for (i = 0; i < 4; i++) {
@ -165,7 +159,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +			val = 1;
 +		else
 +			val = 2;
-+		regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG(i),
+		regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_SEL_REG(i),
 +				   SUN50I_H6_I2S_TX_CHAN_SEL_MASK |
 +				   SUN50I_H6_I2S_TX_CHAN_EN_MASK,
 +				   SUN50I_H6_I2S_TX_CHAN_SEL(val) |
@ -175,18 +169,18 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
 			   SUN50I_H6_I2S_TX_CHAN_SEL_MASK,
 			   SUN50I_H6_I2S_TX_CHAN_SEL(channels));
-@@ -563,10 +604,6 @@ static int sun50i_h6_i2s_set_chan_cfg(co
+@@ -579,10 +620,6 @@ static int sun50i_h6_i2s_set_chan_cfg(co
 			   SUN8I_I2S_FMT0_LRCK_PERIOD_MASK,
 			   SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period));
 
-	regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
+-	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_SEL_REG(0),
 -			   SUN50I_H6_I2S_TX_CHAN_EN_MASK,
 -			   SUN50I_H6_I2S_TX_CHAN_EN(channels));
 -
 	return 0;
 }
 
-@@ -711,6 +748,7 @@ static int sun8i_i2s_set_soc_fmt(const s
+@@ -727,6 +764,7 @@ static int sun8i_i2s_set_soc_fmt(const s
 {
 	u32 mode, val;
 	u8 offset;
@ -194,7 +188,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 
 	/*
 	 * DAI clock polarity
-@@ -778,9 +816,10 @@ static int sun8i_i2s_set_soc_fmt(const s
+@@ -794,9 +832,10 @@ static int sun8i_i2s_set_soc_fmt(const s
 
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
 			   SUN8I_I2S_CTRL_MODE_MASK, mode);
@ -208,7 +202,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	regmap_update_bits(i2s->regmap, SUN8I_I2S_RX_CHAN_SEL_REG,
 			   SUN8I_I2S_TX_CHAN_OFFSET_MASK,
 			   SUN8I_I2S_TX_CHAN_OFFSET(offset));
-@@ -818,6 +857,7 @@ static int sun50i_h6_i2s_set_soc_fmt(con
+@@ -834,6 +873,7 @@ static int sun50i_h6_i2s_set_soc_fmt(con
 {
 	u32 mode, val;
 	u8 offset;
@ -216,7 +210,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 
 	/*
 	 * DAI clock polarity
-@@ -885,9 +925,10 @@ static int sun50i_h6_i2s_set_soc_fmt(con
+@@ -901,9 +941,10 @@ static int sun50i_h6_i2s_set_soc_fmt(con
 
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
 			   SUN8I_I2S_CTRL_MODE_MASK, mode);
@ -230,7 +224,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	regmap_update_bits(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_SEL_REG,
 			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK,
 			   SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset));
-@@ -1196,8 +1237,14 @@ static const struct reg_default sun8i_i2
+@@ -1212,8 +1253,14 @@ static const struct reg_default sun8i_i2
 	{ SUN4I_I2S_DMA_INT_CTRL_REG, 0x00000000 },
 	{ SUN4I_I2S_CLK_DIV_REG, 0x00000000 },
 	{ SUN8I_I2S_CHAN_CFG_REG, 0x00000000 },
@ -247,19 +241,15 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	{ SUN8I_I2S_RX_CHAN_SEL_REG, 0x00000000 },
 	{ SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 },
 };
-@@ -1210,9 +1257,18 @@ static const struct reg_default sun50i_h
- 	{ SUN4I_I2S_DMA_INT_CTRL_REG, 0x00000000 },
+@@ -1227,8 +1274,17 @@ static const struct reg_default sun50i_h
 	{ SUN4I_I2S_CLK_DIV_REG, 0x00000000 },
 	{ SUN8I_I2S_CHAN_CFG_REG, 0x00000000 },
-	{ SUN8I_I2S_TX_CHAN_SEL_REG, 0x00000000 },
-	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0x00000000 },
-	{ SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x00000000 },
-+	{ SUN8I_I2S_TX_CHAN_SEL_REG(0), 0x00000000 },
-+	{ SUN8I_I2S_TX_CHAN_SEL_REG(1), 0x00000000 },
-+	{ SUN8I_I2S_TX_CHAN_SEL_REG(2), 0x00000000 },
-+	{ SUN8I_I2S_TX_CHAN_SEL_REG(3), 0x00000000 },
-+	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG(0), 0x00000000 },
-+	{ SUN50I_H6_I2S_TX_CHAN_MAP1_REG(0), 0x00000000 },
+ 	{ SUN50I_H6_I2S_TX_CHAN_SEL_REG(0), 0x00000000 },
+	{ SUN50I_H6_I2S_TX_CHAN_SEL_REG(1), 0x00000000 },
+	{ SUN50I_H6_I2S_TX_CHAN_SEL_REG(2), 0x00000000 },
+	{ SUN50I_H6_I2S_TX_CHAN_SEL_REG(3), 0x00000000 },
+ 	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG(0), 0x00000000 },
+ 	{ SUN50I_H6_I2S_TX_CHAN_MAP1_REG(0), 0x00000000 },
 +	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG(1), 0x00000000 },
 +	{ SUN50I_H6_I2S_TX_CHAN_MAP1_REG(1), 0x00000000 },
 +	{ SUN50I_H6_I2S_TX_CHAN_MAP0_REG(2), 0x00000000 },
@ -269,7 +259,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 	{ SUN50I_H6_I2S_RX_CHAN_SEL_REG, 0x00000000 },
 	{ SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0x00000000 },
 	{ SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x00000000 },
-@@ -1285,7 +1341,7 @@ static int sun4i_i2s_runtime_resume(stru
+@@ -1301,7 +1357,7 @@ static int sun4i_i2s_runtime_resume(stru
 	/* Enable the first output line */
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
 			   SUN4I_I2S_CTRL_SDO_EN_MASK,
@ -278,7 +268,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 
 	ret = clk_prepare_enable(i2s->mod_clk);
 	if (ret) {
-@@ -1526,6 +1582,7 @@ static int sun4i_i2s_probe(struct platfo
+@@ -1562,6 +1618,7 @@ static int sun4i_i2s_probe(struct platfo
 
 	i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG;
 	i2s->capture_dma_data.maxburst = 8;
--- a/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch
+++ b/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch
@ -14,11 +14,10 @@ Signed-off-by: Ondrej Jirman <megous@megous.com>

 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -57,20 +57,22 @@ struct emac_variant {
+@@ -57,18 +57,20 @@ struct emac_variant {
 };
 
 /* struct sunxi_priv_data - hold all sunxi private data
- * @tx_clk:	reference to MAC TX clock
 - * @ephy_clk:	reference to the optional EPHY clock for the internal PHY
 - * @regulator:	reference to the optional regulator
 - * @rst_ephy:	reference to the optional EPHY reset for the internal PHY
@ -27,7 +26,6 @@ Signed-off-by: Ondrej Jirman <megous@megous.com>
 - * @internal_phy_powered: Does the internal PHY is enabled
 - * @use_internal_phy: Is the internal PHY selected for use
 - * @mux_handle:	Internal pointer used by mdio-mux lib
-+ * @tx_clk:			reference to MAC TX clock
 + * @ephy_clk:			reference to the optional EPHY clock for
 + *				the internal PHY
 + * @regulator_phy:		reference to the optional regulator
@ -40,7 +38,6 @@ Signed-off-by: Ondrej Jirman <megous@megous.com>
 + * @mux_handle:			Internal pointer used by mdio-mux lib
  */
 struct sunxi_priv_data {
- 	struct clk *tx_clk;
 	struct clk *ephy_clk;
 -	struct regulator *regulator;
 +	struct regulator *regulator_phy;
--- a/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch
+++ b/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch
@ -26,8 +26,8 @@ Signed-off-by: Ondrej Jirman <megous@megous.com>
  * @rst_ephy:			reference to the optional EPHY reset for
  *				the internal PHY
  * @variant:			reference to the current board variant
-@@ -73,6 +75,7 @@ struct sunxi_priv_data {
- 	struct clk *tx_clk;
+@@ -73,6 +75,7 @@
+ struct sunxi_priv_data {
 	struct clk *ephy_clk;
 	struct regulator *regulator_phy;
 +	struct regulator *regulator_phy_io;
--- a/projects/Allwinner/patches/linux/0059-bluetooth-hci-h5-add-power-reset-via-gpio-in-h5-btrtl-open.patch
+++ b/projects/Allwinner/patches/linux/0059-bluetooth-hci-h5-add-power-reset-via-gpio-in-h5-btrtl-open.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vyacheslav Bocharov <adeep@lexina.in>
-Subject: [PATCH v3 2/2] Bluetooth: hci_h5: Add power reset via gpio in h5_btrtl_open
-Date: Wed, 27 Oct 2021 12:14:16 +0300
-
-Add power reset via enable-gpios in h5_btrtl_open function.
-
-Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
---
- drivers/bluetooth/hci_h5.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
-index 34286ffe0568..fdf504b0d265 100644
--- a/drivers/bluetooth/hci_h5.c
-+++ b/drivers/bluetooth/hci_h5.c
-@@ -966,6 +966,11 @@ static void h5_btrtl_open(struct h5 *h5)
- 		pm_runtime_enable(&h5->hu->serdev->dev);
- 	}
- 
-+	/* The controller needs reset to startup */
-+	gpiod_set_value_cansleep(h5->enable_gpio, 0);
-+	gpiod_set_value_cansleep(h5->device_wake_gpio, 0);
-+	msleep(100);
-+
- 	/* The controller needs up to 500ms to wakeup */
- 	gpiod_set_value_cansleep(h5->enable_gpio, 1);
- 	gpiod_set_value_cansleep(h5->device_wake_gpio, 1);
--- a/projects/Allwinner/patches/linux/0089-media-cedrus-Add-watchdog-for-job-completion.patch
+++ b/projects/Allwinner/patches/linux/0089-media-cedrus-Add-watchdog-for-job-completion.patch
@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Tue, 1 Feb 2022 19:14:18 +0100
-Subject: [PATCH] media: cedrus: Add watchdog for job completion
-
-Currently, if job is not completed for whatever reason, userspace
-application can hang on ioctl and thus become unkillable.
-
-In order to prevent that, implement watchdog, which will complete job
-after 2 seconds with error state.
-
-Concept is borrowed from hantro driver.
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
- drivers/staging/media/sunxi/cedrus/cedrus.c   |  2 ++
- drivers/staging/media/sunxi/cedrus/cedrus.h   |  3 +++
- .../staging/media/sunxi/cedrus/cedrus_dec.c   |  4 +++
- .../staging/media/sunxi/cedrus/cedrus_hw.c    | 25 +++++++++++++++++++
- .../staging/media/sunxi/cedrus/cedrus_hw.h    |  2 ++
- 5 files changed, 36 insertions(+)
-
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
-index 4a4b714b0f26..68b3dcdb5df3 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
-@@ -439,6 +439,8 @@ static int cedrus_probe(struct platform_device *pdev)
- 
- 	mutex_init(&dev->dev_mutex);
- 
-+	INIT_DELAYED_WORK(&dev->watchdog_work, cedrus_watchdog);
-+
- 	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
- 	if (ret) {
- 		dev_err(&pdev->dev, "Failed to register V4L2 device\n");
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
-index c345f2984041..3bc094eb497f 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
-@@ -24,6 +24,7 @@
- 
- #include <linux/iopoll.h>
- #include <linux/platform_device.h>
-+#include <linux/workqueue.h>
- 
- #define CEDRUS_NAME			"cedrus"
- 
-@@ -194,6 +195,8 @@ struct cedrus_dev {
- 	struct reset_control	*rstc;
- 
- 	unsigned int		capabilities;
-+
-+	struct delayed_work	watchdog_work;
- };
- 
- extern struct cedrus_dec_ops cedrus_dec_ops_mpeg2;
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
-index a16c1422558f..9c7200299465 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
-@@ -97,4 +97,8 @@ void cedrus_device_run(void *priv)
- 		v4l2_ctrl_request_complete(src_req, &ctx->hdl);
- 
- 	dev->dec_ops[ctx->current_codec]->trigger(ctx);
-+
-+	/* Start the watchdog timer. */
-+	schedule_delayed_work(&dev->watchdog_work,
-+			      msecs_to_jiffies(2000));
- }
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
-index 2d7663726467..a6470a89851e 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
-@@ -118,6 +118,13 @@ static irqreturn_t cedrus_irq(int irq, void *data)
- 	enum vb2_buffer_state state;
- 	enum cedrus_irq_status status;
- 
-+	/*
-+	 * If cancel_delayed_work returns false it means watchdog already
-+	 * executed and finished the job.
-+	 */
-+	if (!cancel_delayed_work(&dev->watchdog_work))
-+		return IRQ_HANDLED;
-+
- 	ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);
- 	if (!ctx) {
- 		v4l2_err(&dev->v4l2_dev,
-@@ -143,6 +150,24 @@ static irqreturn_t cedrus_irq(int irq, void *data)
- 	return IRQ_HANDLED;
- }
- 
-+void cedrus_watchdog(struct work_struct *work)
-+{
-+	struct cedrus_dev *dev;
-+	struct cedrus_ctx *ctx;
-+
-+	dev = container_of(to_delayed_work(work),
-+			   struct cedrus_dev, watchdog_work);
-+
-+	ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);
-+	if (!ctx)
-+		return;
-+
-+	v4l2_err(&dev->v4l2_dev, "frame processing timed out!\n");
-+	reset_control_reset(dev->rstc);
-+	v4l2_m2m_buf_done_and_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx,
-+					 VB2_BUF_STATE_ERROR);
-+}
-+
- int cedrus_hw_suspend(struct device *device)
- {
- 	struct cedrus_dev *dev = dev_get_drvdata(device);
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
-index 45f641f0bfa2..7c92f00e36da 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
-@@ -28,4 +28,6 @@ int cedrus_hw_resume(struct device *device);
- int cedrus_hw_probe(struct cedrus_dev *dev);
- void cedrus_hw_remove(struct cedrus_dev *dev);
- 
-+void cedrus_watchdog(struct work_struct *work);
-+
- #endif
--- a/projects/Generic/devices/Generic-legacy/filesystem
+++ b/projects/Generic/devices/Generic-legacy/filesystem
@ -0,0 +1 @@
+../x11/filesystem
--- a/projects/Generic/devices/Generic-legacy/patches
+++ b/projects/Generic/devices/Generic-legacy/patches
@ -0,0 +1 @@
+../x11/patches/
--- a/projects/Generic/devices/x11/patches/linux/linux-revert-acpi-bus-get-device-5-18.patch
+++ b/projects/Generic/devices/x11/patches/linux/linux-revert-acpi-bus-get-device-5-18.patch
@ -0,0 +1,56 @@
+From ac2a3feefad549814f5e7cca30be07a255c8494a Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Tue, 5 Apr 2022 19:49:26 +0200
+Subject: Revert ACPI: bus: Eliminate acpi_bus_get_device()
+
+Revert d017a3167bcb76caedf2b444645bf4db75f775a5
+
+  Replace the last instance of acpi_bus_get_device(), added recently
+  by commit 87e59b36e5e2 ("spi: Support selection of the index of the
+  ACPI Spi Resource before alloc"), with acpi_fetch_acpi_dev() and
+  finally drop acpi_bus_get_device() that has no more users.
+
+---
+ drivers/acpi/scan.c     | 13 +++++++++++++
+ include/acpi/acpi_bus.h |  1 +
+ 2 files changed, 14 insertions(+)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 9efbfe087de76..762b61f67e6c6 100644
+--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
+@@ -588,6 +588,19 @@ static struct acpi_device *handle_to_device(acpi_handle handle,
+ 	return adev;
+ }
+ 
+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
+{
+	if (!device)
+		return -EINVAL;
+
+	*device = handle_to_device(handle, NULL);
+	if (!*device)
+		return -ENODEV;
+
+	return 0;
+}
+EXPORT_SYMBOL(acpi_bus_get_device);
+
+ /**
+  * acpi_fetch_acpi_dev - Retrieve ACPI device object.
+  * @handle: ACPI handle associated with the requested ACPI device object.
+diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
+index 3f7f01f038690..c4b78c21d7930 100644
+--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
+@@ -509,6 +509,7 @@ extern int unregister_acpi_notifier(struct notifier_block *);
+  * External Functions
+  */
+ 
+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device);
+ struct acpi_device *acpi_fetch_acpi_dev(acpi_handle handle);
+ acpi_status acpi_bus_get_status_handle(acpi_handle handle,
+ 				       unsigned long long *sta);
+-- 
+cgit 1.2.3-1.el7
+
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
--- a/projects/NXP/devices/iMX6/linux/linux.arm.conf
+++ b/projects/NXP/devices/iMX6/linux/linux.arm.conf
--- a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf
+++ b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf
--- a/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
@ -777,7 +777,7 @@ index 000000000000..da40f62617ef
 +		break;
 +	}
 +
-+	drm_hdmi_avi_infoframe_colorspace(&frame, conn_state);
+	drm_hdmi_avi_infoframe_colorimetry(&frame, conn_state);
 +
 +	adj_mode = &mhdp->bridge.base.encoder->crtc->state->adjusted_mode;
 +
@ -3452,7 +3452,7 @@ index 000000000000..399c3f6f86ad
 +#ifndef CDNS_MHDP_H
 +#define CDNS_MHDP_H
 +
-+#include <drm/drm_dp_mst_helper.h>
+#include <drm/dp/drm_dp_mst_helper.h>
 +
 +#define CDNS_APB_CFG				0x00000
 +#define CDNS_APB_CTRL				(CDNS_APB_CFG + 0x00)
@ -4110,7 +4110,7 @@ index a4a45daf93f2..058bc372f02b 100644
 +		DRM_DEV_ERROR(dev, "Failed to valid video %d\n", ret);
 		goto out;
 	}
- out:
+ 
@@ -652,7 +662,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
 	if (dp->active) {
 		ret = cdn_dp_disable(dp);
@ -4408,7 +4408,7 @@ index 81ac9b658a70..8b1b15b92503 100644
 #define _CDN_DP_CORE_H
 
 +#include <drm/bridge/cdns-mhdp.h>
- #include <drm/drm_dp_helper.h>
+ #include <drm/dp/drm_dp_helper.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_probe_helper.h>
@@ -15,35 +16,6 @@
@ -4489,8 +4489,8 @@ index 81ac9b658a70..8b1b15b92503 100644
 
 -	u8 dpcd[DP_RECEIVER_CAP_SIZE];
 	bool sink_has_audio;
- };
- #endif  /* _CDN_DP_CORE_H */
+ 
+ 	hdmi_codec_plugged_cb plugged_cb;
 diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
 deleted file mode 100644
 index 9d2163ef4d6e..000000000000
@ -5488,8 +5488,8 @@ index 441248b7a79e..d76716d4edc6 100644
 
 +#include <drm/drm_bridge.h>
 +#include <drm/drm_connector.h>
-+#include <drm/drm_dp_helper.h>
-+#include <drm/drm_dp_mst_helper.h>
+#include <drm/dp/drm_dp_helper.h>
+#include <drm/dp/drm_dp_mst_helper.h>
 +#include <media/cec.h>
 #include <linux/bitops.h>
 
--- a/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch
@ -126,7 +126,7 @@ index 1f8fd024cdfa..6bfd82a3d9a2 100644
 --- a/include/drm/bridge/cdns-mhdp.h
 +++ b/include/drm/bridge/cdns-mhdp.h
@@ -22,6 +22,7 @@
- #include <drm/drm_dp_mst_helper.h>
+ #include <drm/dp/drm_dp_mst_helper.h>
 #include <media/cec.h>
 #include <linux/bitops.h>
 +#include <sound/hdmi-codec.h>
--- a/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch
@ -96,7 +96,7 @@ index 000000000000..a6d03c94d196
 + */
 +#include <linux/clk.h>
 +#include <linux/kernel.h>
-+#include <drm/drm_dp_helper.h>
+#include <drm/dp/drm_dp_helper.h>
 +#include <drm/bridge/cdns-mhdp.h>
 +#include "cdns-mhdp-phy.h"
 +
--- a/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch
@ -17,9 +17,9 @@ index 8dc2f85c514b..09d0ac28e28a 100644
 --- a/drivers/gpu/drm/imx/dcss/dcss-drv.c
 +++ b/drivers/gpu/drm/imx/dcss/dcss-drv.c
@@ -6,6 +6,7 @@
- #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+ #include <drm/drm_module.h>
 +#include <linux/component.h>
 #include <drm/drm_of.h>
 
--- a/projects/NXP/devices/iMX8/patches/linux/0090-media-hantro-Let-VPU-decoders-get-controlled-by-vpu-blk-ctrl.patch
+++ b/projects/NXP/devices/iMX8/patches/linux/0090-media-hantro-Let-VPU-decoders-get-controlled-by-vpu-blk-ctrl.patch
--- a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
+++ b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
@ -1,21 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.17.0-rc3 Kernel Configuration
+# Linux/arm64 5.18.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621"
+CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-11.3.0 (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100301
+CONFIG_GCC_VERSION=110300
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23601
+CONFIG_AS_VERSION=23700
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23601
+CONFIG_LD_VERSION=23700
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@ -104,6 +104,7 @@ CONFIG_PREEMPT_BUILD=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
+# CONFIG_PREEMPT_DYNAMIC is not set

 #
 # CPU/Task time and stats accounting
@ -264,6 +265,7 @@ CONFIG_PROFILING=y
 # end of General setup

 CONFIG_ARM64=y
+CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
@ -400,7 +402,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@ -712,6 +713,7 @@ CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
 # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
@ -722,6 +724,8 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

@ -755,6 +759,7 @@ CONFIG_MODULE_COMPRESS_NONE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
@ -812,6 +817,7 @@ CONFIG_FREEZER=y
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_STATE=y
+CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_HAVE_ELF_PROT=y
 CONFIG_ARCH_USE_GNU_PROPERTY=y
 CONFIG_ELFCORE=y
@ -864,6 +870,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
@ -1478,6 +1485,7 @@ CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_PAGE_POOL=y
+# CONFIG_PAGE_POOL_STATS is not set
 CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y

@ -1515,6 +1523,8 @@ CONFIG_PCI_IOV=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_HOTPLUG_PCI is not set

 #
@ -1639,7 +1649,6 @@ CONFIG_VEXPRESS_CONFIG=y

 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
-# CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT is not set
@ -1764,6 +1773,7 @@ CONFIG_MTD_CFI_I2=y
 #
 # CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# CONFIG_MTD_NAND_ECC_MXIC is not set
 # end of ECC engine support
 # end of NAND

@ -1850,6 +1860,7 @@ CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
+# CONFIG_OPEN_DICE is not set
 # CONFIG_C2PORT is not set

 #
@ -2162,8 +2173,6 @@ CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_BNX2X is not set
 # CONFIG_SYSTEMPORT is not set
 # CONFIG_BNXT is not set
-CONFIG_NET_VENDOR_BROCADE=y
-# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=y
 CONFIG_MACB_USE_HWSTAMP=y
@ -2185,6 +2194,7 @@ CONFIG_NET_VENDOR_CISCO=y
 # CONFIG_ENIC is not set
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
+# CONFIG_NET_VENDOR_DAVICOM is not set
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_DEC=y
 # CONFIG_NET_TULIP is not set
@ -2196,6 +2206,7 @@ CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_NET_VENDOR_ENGLEDER is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+# CONFIG_NET_VENDOR_FUNGIBLE is not set
 CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HISILICON=y
@ -2224,7 +2235,6 @@ CONFIG_IGBVF=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
-# CONFIG_NET_VENDOR_MICROSOFT is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_LITEX is not set
 CONFIG_NET_VENDOR_MARVELL=y
@ -2250,9 +2260,12 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_NET_VENDOR_MICROSOFT is not set
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NS83820 is not set
@ -2261,8 +2274,6 @@ CONFIG_NET_VENDOR_NETERION=y
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
@ -2279,6 +2290,8 @@ CONFIG_NET_VENDOR_QLOGIC=y
 # CONFIG_QLCNIC is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_QED is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
@ -2294,14 +2307,14 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
 # CONFIG_SIS900 is not set
 # CONFIG_SIS190 is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=y
 # CONFIG_EPIC100 is not set
@ -2541,6 +2554,7 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_VIVALDIFMAP=y

 #
 # Userland interfaces
@ -2653,6 +2667,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_IMAGIS is not set
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
@ -2812,7 +2827,6 @@ CONFIG_SERIAL_MSM_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
@ -2844,7 +2858,6 @@ CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_CAVIUM=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
@ -3085,6 +3098,7 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC7280 is not set
 # CONFIG_PINCTRL_SC8180X is not set
+# CONFIG_PINCTRL_SC8280XP is not set
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SDX55 is not set
@ -3213,12 +3227,14 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@ -3251,6 +3267,7 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
+# CONFIG_BATTERY_UG3105 is not set
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
@ -3376,6 +3393,7 @@ CONFIG_MFD_MAX77620=y
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@ -3400,6 +3418,7 @@ CONFIG_MFD_SPMI_PMIC=y
 # CONFIG_MFD_RN5T618 is not set
 CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@ -3500,6 +3519,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT6160 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
@ -3509,11 +3529,13 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
+# CONFIG_REGULATOR_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS6286X is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS65132 is not set
@ -3523,20 +3545,20 @@ CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
 CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
 # CONFIG_LIRC is not set
+CONFIG_RC_MAP=y
 CONFIG_RC_DECODERS=y
+# CONFIG_IR_IMON_DECODER is not set
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_NEC_DECODER=y
 CONFIG_IR_RC5_DECODER=y
 CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
+# CONFIG_IR_RCMM_DECODER is not set
 CONFIG_IR_SANYO_DECODER=y
 CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
+CONFIG_IR_SONY_DECODER=y
 CONFIG_IR_XMP_DECODER=y
-# CONFIG_IR_IMON_DECODER is not set
-# CONFIG_IR_RCMM_DECODER is not set
 # CONFIG_RC_DEVICES is not set
 CONFIG_CEC_CORE=y

@ -3569,7 +3591,6 @@ CONFIG_MEDIA_CONTROLLER=y
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@ -3590,17 +3611,17 @@ CONFIG_VIDEOBUF_VMALLOC=m
 #
 # Drivers filtered as selected at 'Filter media drivers'
 #
+
+#
+# Media drivers
+#
 CONFIG_MEDIA_USB_SUPPORT=y

 #
 # Webcam devices
 #
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA_BENQ=m
 CONFIG_USB_GSPCA_CONEX=m
 CONFIG_USB_GSPCA_CPIA1=m
@ -3625,13 +3646,13 @@ CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
 CONFIG_USB_GSPCA_SPCA500=m
 CONFIG_USB_GSPCA_SPCA501=m
 CONFIG_USB_GSPCA_SPCA505=m
 CONFIG_USB_GSPCA_SPCA506=m
 CONFIG_USB_GSPCA_SPCA508=m
 CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
 CONFIG_USB_GSPCA_SQ905=m
 CONFIG_USB_GSPCA_SQ905C=m
 CONFIG_USB_GSPCA_SQ930X=m
@ -3647,14 +3668,18 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_USB_STKWEBCAM=m
 # CONFIG_VIDEO_USBTV is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_ZR364XX=m

 #
 # Webcam, TV (analog/digital) USB devices
@ -3672,25 +3697,115 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 #
 CONFIG_VIDEO_IR_I2C=y

+#
+# Camera sensor devices
+#
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
+# CONFIG_VIDEO_HI847 is not set
+# CONFIG_VIDEO_IMX208 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OG01A1B is not set
+# CONFIG_VIDEO_OV02A10 is not set
+# CONFIG_VIDEO_OV08D10 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
+# CONFIG_VIDEO_OV2640 is not set
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2740 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
+# CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
 #
 # Audio decoders, processors and mixers
 #
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_CS3308 is not set
 # CONFIG_VIDEO_CS5345 is not set
 # CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_TDA1997X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
 # end of Audio decoders, processors and mixers

 #
@ -3710,7 +3825,9 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_BT819 is not set
 # CONFIG_VIDEO_BT856 is not set
 # CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
@ -3723,7 +3840,6 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_TW9906 is not set
 # CONFIG_VIDEO_TW9910 is not set
 # CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_MAX9286 is not set

 #
 # Video and audio decoders
@ -3735,14 +3851,14 @@ CONFIG_VIDEO_IR_I2C=y
 #
 # Video encoders
 #
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_THS8200 is not set
 # end of Video encoders

@ -3767,122 +3883,29 @@ CONFIG_VIDEO_IR_I2C=y
 #
 # Miscellaneous helper chips
 #
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_ST_MIPID02 is not set
+# CONFIG_VIDEO_THS7303 is not set
 # end of Miscellaneous helper chips

-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_IMX208 is not set
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX334 is not set
-# CONFIG_VIDEO_IMX335 is not set
-# CONFIG_VIDEO_IMX355 is not set
-# CONFIG_VIDEO_IMX412 is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV2740 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV8865 is not set
-# CONFIG_VIDEO_OV9282 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV9734 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_OV13B10 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RDACM20 is not set
-# CONFIG_VIDEO_RDACM21 is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_CCS is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9768 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
 #
 # Media SPI Adapters
 #
+# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 # end of Media ancillary drivers

 #
 # Graphics support
 #
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_BUS=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_DP_HELPER=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@ -3923,7 +3946,6 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=y
 CONFIG_DRM_MSM_GPU_STATE=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_HDMI_HDCP is not set
 CONFIG_DRM_MSM_DP=y
 CONFIG_DRM_MSM_DSI=y
@ -3966,6 +3988,7 @@ CONFIG_DRM_PANEL_EDP=y
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
@ -3996,7 +4019,6 @@ CONFIG_DRM_PANEL_EDP=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@ -4019,6 +4041,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@ -4060,6 +4083,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_PANEL_MIPI_DBI is not set
 # CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@ -4076,6 +4100,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_PANFROST is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
@ -4321,6 +4346,7 @@ CONFIG_SND_SOC=y

 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_INTEL_AVS is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 CONFIG_SND_SOC_QCOM=y
 CONFIG_SND_SOC_LPASS_CPU=y
@ -4365,6 +4391,7 @@ CONFIG_SND_SOC_AK4613=y
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@ -4450,6 +4477,7 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@ -4598,12 +4626,14 @@ CONFIG_HID_OUYA=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 CONFIG_HID_PLANTRONICS=m
+# CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
 CONFIG_HID_SONY=y
 CONFIG_SONY_FF=y
 # CONFIG_HID_SPEEDLINK is not set
@ -4851,6 +4881,7 @@ CONFIG_USB_SERIAL_QT2=m
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_QCOM_EUD is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
@ -5336,6 +5367,7 @@ CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CHROMEOS_TBMC is not set
 # CONFIG_CROS_EC is not set
 # CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_HAVE_CLK=y
@ -5362,11 +5394,11 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 CONFIG_COMMON_CLK_CS2000_CP=y
-# CONFIG_COMMON_CLK_LAN966X is not set
 CONFIG_COMMON_CLK_S2MPS11=y
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
@ -5405,6 +5437,7 @@ CONFIG_MSM_MMCC_8996=y
 # CONFIG_MSM_GPUCC_8998 is not set
 # CONFIG_MSM_MMCC_8998 is not set
 # CONFIG_QCM_GCC_2290 is not set
+# CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
@ -5432,8 +5465,8 @@ CONFIG_MSM_MMCC_8996=y
 # CONFIG_SDM_DISPCC_845 is not set
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_55 is not set
-# CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SDX_GCC_65 is not set
+# CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 # CONFIG_SM_GCC_6350 is not set
@ -5441,6 +5474,7 @@ CONFIG_MSM_MMCC_8996=y
 # CONFIG_SM_GCC_8250 is not set
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
+# CONFIG_SM_GPUCC_6350 is not set
 # CONFIG_SM_GPUCC_8150 is not set
 # CONFIG_SM_GPUCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
@ -5525,6 +5559,7 @@ CONFIG_QCOM_WCNSS_PIL=m
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
+# CONFIG_RPMSG_CTRL is not set
 # CONFIG_RPMSG_NS is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
@ -5651,6 +5686,8 @@ CONFIG_IIO=y
 # CONFIG_ADXL345_SPI is not set
 # CONFIG_ADXL355_I2C is not set
 # CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@ -5690,6 +5727,7 @@ CONFIG_IIO=y
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
@ -5764,6 +5802,7 @@ CONFIG_IIO=y
 # Amplifiers
 #
 # CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers

@ -5820,6 +5859,7 @@ CONFIG_IIO=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
@ -5875,6 +5915,8 @@ CONFIG_IIO=y
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADMV1013 is not set
+# CONFIG_ADMV1014 is not set
+# CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@ -6086,6 +6128,8 @@ CONFIG_IIO=y
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
@ -6139,6 +6183,7 @@ CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_QCOM_IRQ_COMBINER is not set
 # CONFIG_QCOM_PDC is not set
+# CONFIG_QCOM_MPM is not set
 # end of IRQ chip support

 # CONFIG_IPACK_BUS is not set
@ -6162,11 +6207,9 @@ CONFIG_PHY_XGENE=y

 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_LAN966X_SERDES is not set
@ -6207,7 +6250,6 @@ CONFIG_ARM_PMU_ACPI=y
 # CONFIG_QCOM_L3_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_ARM_DMC620_PMU is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # CONFIG_HISI_PMU is not set
 # CONFIG_HISI_PCIE_PMU is not set
 # end of Performance monitor support
@ -6245,6 +6287,7 @@ CONFIG_PM_OPP=y
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
+# CONFIG_PECI is not set
 # end of Device Drivers

 #
@ -6281,7 +6324,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
-# CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@ -6426,7 +6468,6 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 # CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
 CONFIG_GRACE_PERIOD=y
@ -6597,6 +6638,7 @@ CONFIG_CRYPTO_ENGINE=m
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
 CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
@ -6647,6 +6689,7 @@ CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO_BLAKE2B=y
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_POLY1305 is not set
 CONFIG_CRYPTO_MD4=y
@ -6791,6 +6834,7 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@ -6798,7 +6842,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
+CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
@ -6850,7 +6894,6 @@ CONFIG_SWIOTLB=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
-CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set
@ -6912,16 +6955,20 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options

+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
 #
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
@ -6953,9 +7000,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments

-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
 #
 # Networking Debugging
 #
@ -7140,7 +7184,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@ -7157,7 +7200,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
--- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
+++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
--- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
--- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
--- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch
+++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch
@ -1130,7 +1130,7 @@ index 303c6e81ca4f..73fad678b6ee 100644
 +	int clock = mode->clock;
 +
 +	if (pdata->ycbcr_420_allowed && drm_mode_is_420(info, mode) &&
-+	    (info->color_formats & DRM_COLOR_FORMAT_YCRCB420))
+	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420))
 +		clock /= 2;
 +
 +	if (clock > 340000 ||
@ -2103,7 +2103,7 @@ index 90e683c65cbe..419fd9124d7b 100644
 	struct drm_display_mode *mode = &crtc_state->mode;
 	u8 max_bpc = conn_state->max_requested_bpc;
 -	bool is_hdmi2_sink = info->hdmi.scdc.supported ||
-			     (info->color_formats & DRM_COLOR_FORMAT_YCRCB420);
+-			     (info->color_formats & DRM_COLOR_FORMAT_YCBCR420);
 	u32 *output_fmts;
 	unsigned int i = 0;
 
@ -2115,7 +2115,7 @@ index 90e683c65cbe..419fd9124d7b 100644
 -	    (drm_mode_is_420_only(info, mode) ||
 -	     (is_hdmi2_sink && drm_mode_is_420_also(info, mode)))) {
 +	if (conn->ycbcr_420_allowed && drm_mode_is_420(info, mode) &&
-+	    (info->color_formats & DRM_COLOR_FORMAT_YCRCB420)) {
+	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420)) {
 
 		/* Order bus formats from 16bit to 8bit if supported */
 		if (max_bpc >= 16 && info->bpc == 16 &&
@ -2153,8 +2153,8 @@ index 90e683c65cbe..419fd9124d7b 100644
 	 */
 
 	if (max_bpc >= 16 && info->bpc == 16) {
-		if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
-+		if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB444) &&
+-		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+		if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR444) &&
 +		    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV16_1X48))
 			output_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
 
@ -2164,13 +2164,13 @@ index 90e683c65cbe..419fd9124d7b 100644
 	}
 
 	if (max_bpc >= 12 && info->bpc >= 12) {
-		if (info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
-+		if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB422) &&
+-		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+		if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR422) &&
 +		    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_UYVY12_1X24))
 			output_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
 
-		if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
-+		if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB444) &&
+-		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+		if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR444) &&
 +		    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV12_1X36))
 			output_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
 
@ -2180,13 +2180,13 @@ index 90e683c65cbe..419fd9124d7b 100644
 	}
 
 	if (max_bpc >= 10 && info->bpc >= 10) {
-		if (info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
-+		if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB422) &&
+-		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+		if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR422) &&
 +		    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_UYVY10_1X20))
 			output_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
 
-		if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
-+		if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB444) &&
+-		if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+		if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR444) &&
 +		    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV10_1X30))
 			output_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
 
@ -2195,13 +2195,13 @@ index 90e683c65cbe..419fd9124d7b 100644
 +			output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
 	}
 
-	if (info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
-+	if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB422) &&
+-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+	if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR422) &&
 +	    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_UYVY8_1X16))
 		output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
 
-	if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
-+	if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB444) &&
+-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+	if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR444) &&
 +	    is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV8_1X24))
 		output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
 
@ -2224,7 +2224,7 @@ index 90e683c65cbe..419fd9124d7b 100644
 		return MODE_BAD;
 
 +	if (pdata->ycbcr_420_allowed && drm_mode_is_420(info, mode) &&
-+	    (info->color_formats & DRM_COLOR_FORMAT_YCRCB420))
+	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420))
 +		clock /= 2;
 +
 +	if (clock > max_tmds_clock)
@ -2843,8 +2843,8 @@ index 78b77b31436a..976dd3c9c26f 100644
 +	int i = 0;
 
 	if (pdata->ycbcr_420_allowed && drm_mode_is_420(info, mode) &&
-	    (info->color_formats & DRM_COLOR_FORMAT_YCRCB420))
-+	    (info->color_formats & DRM_COLOR_FORMAT_YCRCB420)) {
+-	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420))
+	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420)) {
 		clock /= 2;
 +		mpll_cfg = pdata->mpll_cfg_420;
 +	}
--- a/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch
+++ b/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch
@ -2338,13 +2338,13 @@ index 000000000000..c3cceba837c2
 +		memset(hw_ps, 0, sizeof(*hw_ps));
 +
 +		for (i = 0; i <= sl_params->num_ref_idx_l0_active_minus1; i++) {
-+			WRITE_RPS(!!(dpb[sl_params->ref_idx_l0[i]].rps == V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR),
+			WRITE_RPS(!!(dpb[sl_params->ref_idx_l0[i]].flags & V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE),
 +				  REF_PIC_LONG_TERM_L0(i));
 +			WRITE_RPS(sl_params->ref_idx_l0[i], REF_PIC_IDX_L0(i));
 +		}
 +
 +		for (i = 0; i <= sl_params->num_ref_idx_l1_active_minus1; i++) {
-+			WRITE_RPS(!!(dpb[sl_params->ref_idx_l1[i]].rps == V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR),
+			WRITE_RPS(!!(dpb[sl_params->ref_idx_l1[i]].flags & V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE),
 +				  REF_PIC_LONG_TERM_L1(i));
 +			WRITE_RPS(sl_params->ref_idx_l1[i], REF_PIC_IDX_L1(i));
 +		}
@ -3077,7 +3077,7 @@ index 55bf61a84165..db33f9d357cf 100644
 		hw_ps = &priv_tbl->rps[j];
 		memset(hw_ps, 0, sizeof(*hw_ps));
@@ -2211,18 +2213,23 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx,
- 			WRITE_RPS(!!(dpb[sl_params->ref_idx_l0[i]].rps == V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR),
+ 			WRITE_RPS(!!(dpb[sl_params->ref_idx_l0[i].flags & V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE),
 				  REF_PIC_LONG_TERM_L0(i));
 			WRITE_RPS(sl_params->ref_idx_l0[i], REF_PIC_IDX_L0(i));
 +
@ -3086,7 +3086,7 @@ index 55bf61a84165..db33f9d357cf 100644
 		}
 
 		for (i = 0; i <= sl_params->num_ref_idx_l1_active_minus1; i++) {
- 			WRITE_RPS(!!(dpb[sl_params->ref_idx_l1[i]].rps == V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR),
+ 			WRITE_RPS(!!(dpb[sl_params->ref_idx_l1[i]].flags & V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE),
 				  REF_PIC_LONG_TERM_L1(i));
 			WRITE_RPS(sl_params->ref_idx_l1[i], REF_PIC_IDX_L1(i));
 +
--- a/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch
+++ b/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch
@ -96,10 +96,10 @@ Subject: [PATCH] media: rockchip: Add Rockchip IEP driver

 Signed-off-by: Alex Bee <knaerzche@gmail.com>
 ---
- drivers/media/platform/Kconfig                |   14 +
 drivers/media/platform/Makefile               |    1 +
 drivers/media/platform/rockchip/iep/Makefile  |    5 +
 .../media/platform/rockchip/iep/iep-regs.h    |  291 +++++
+ .../media/platform/rockchip/iep/Kconfig       |   16 +
 drivers/media/platform/rockchip/iep/iep.c     | 1089 +++++++++++++++++
 drivers/media/platform/rockchip/iep/iep.h     |  112 ++
 6 files changed, 1512 insertions(+)
@ -108,17 +108,17 @@ Signed-off-by: Alex Bee <knaerzche@gmail.com>
 create mode 100644 drivers/media/platform/rockchip/iep/iep.c
 create mode 100644 drivers/media/platform/rockchip/iep/iep.h

-diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
+diff --git /dev/null b/drivers/media/platform/rockchip/iep/Kconfig
 index cf4adc64c953..79b850a71449 100644
--- a/drivers/media/platform/Kconfig
-+++ b/drivers/media/platform/Kconfig
-@@ -546,6 +546,20 @@ config VIDEO_RENESAS_VSP1
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called vsp1.
- 
+--- /dev/null
+++ b/drivers/media/platform/rockchip/iep/Kconfig
+@@ -0,0 +1,16 @@ config VIDEO_RENESAS_VSP1
+# SPDX-License-Identifier: GPL-2.0-only
+ 
 +config VIDEO_ROCKCHIP_IEP
 +	tristate "Rockchip Image Enhancement Processor"
-+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV
 +	depends on ARCH_ROCKCHIP || COMPILE_TEST
 +	select VIDEOBUF2_DMA_CONTIG
 +	select V4L2_MEM2MEM_DEV
@ -129,22 +129,25 @@ index cf4adc64c953..79b850a71449 100644
 +	  images. The driver currently implements YUV deinterlacing only.
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called rockchip-iep
-+
- config VIDEO_ROCKCHIP_RGA
- 	tristate "Rockchip Raster 2d Graphic Acceleration Unit"
- 	depends on VIDEO_DEV && VIDEO_V4L2
-diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
+diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
+--- a/drivers/media/platform/rockchip/Kconfig	2022-04-24 04:43:48.781195873 +0000
+++ b/drivers/media/platform/rockchip/Kconfig	2022-04-24 04:39:04.394777975 +0000
+@@ -2,5 +2,6 @@
+ 
+ comment "Rockchip media platform drivers"
+ 
+source "drivers/media/platform/rockchip/iep/Kconfig"
+ source "drivers/media/platform/rockchip/rga/Kconfig"
+ source "drivers/media/platform/rockchip/rkisp1/Kconfig"
+diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile
 index a148553babfc..08fcccdbbb49 100644
--- a/drivers/media/platform/Makefile
-+++ b/drivers/media/platform/Makefile
-@@ -54,6 +54,7 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
- obj-$(CONFIG_VIDEO_RENESAS_JPU)		+= rcar_jpu.o
- obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1/
- 
-+obj-$(CONFIG_VIDEO_ROCKCHIP_IEP)	+= rockchip/iep/
- obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1)	+= rockchip/rkisp1/
- obj-$(CONFIG_VIDEO_ROCKCHIP_RGA)	+= rockchip/rga/
- 
+--- a/drivers/media/platform/rockchip/Makefile
+++ b/drivers/media/platform/rockchip/Makefile
+@@ -1,3 +1,4 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+obj-y += iep/
+ obj-y += rga/
+ obj-y += rkisp1/
 diff --git a/drivers/media/platform/rockchip/iep/Makefile b/drivers/media/platform/rockchip/iep/Makefile
 new file mode 100644
 index 000000000000..5c89b3277469
--- a/projects/Samsung/linux/linux.arm.conf
+++ b/projects/Samsung/linux/linux.arm.conf
@ -1,21 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.17.0-rc3 Kernel Configuration
+# Linux/arm 5.18.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.3.0 (GCC) 10.3.0"
+CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-11.3.0 (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100300
+CONFIG_GCC_VERSION=110300
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23501
+CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23501
+CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@ -253,6 +255,7 @@ CONFIG_TRACEPOINTS=y
 # end of General setup

 CONFIG_ARM=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
@ -298,6 +301,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of Multiple platform selection

 # CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
@ -444,6 +448,7 @@ CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
+CONFIG_IRQSTACKS=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 # CONFIG_SCHED_SMT is not set
@ -481,7 +486,6 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
@ -667,6 +671,8 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
@ -678,6 +684,8 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@ -720,6 +728,7 @@ CONFIG_MODULE_COMPRESS_NONE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
@ -756,6 +765,7 @@ CONFIG_EFI_PARTITION=y

 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y

 #
 # IO Schedulers
@ -806,6 +816,7 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
@ -816,6 +827,7 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
@ -1049,6 +1061,8 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
+CONFIG_PAGE_POOL=y
+# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_FAILOVER is not set
 CONFIG_ETHTOOL_NETLINK=y

@ -1193,6 +1207,7 @@ CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
+# CONFIG_OPEN_DICE is not set
 # CONFIG_C2PORT is not set

 #
@ -1251,15 +1266,15 @@ CONFIG_BLK_DEV_BSG=y
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=y
+# CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 # end of SCSI Transports

 CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=y
-CONFIG_ISCSI_BOOT_SYSFS=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
@ -1332,25 +1347,26 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DM9000 is not set
+# CONFIG_NET_VENDOR_DAVICOM is not set
 # CONFIG_DNET is not set
 # CONFIG_NET_VENDOR_ENGLEDER is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_FUNGIBLE is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 # CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MICROSOFT is not set
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_ETHOC is not set
 # CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
@ -1565,6 +1581,7 @@ CONFIG_MT76x2U=m
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
 # CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@ -1709,6 +1726,7 @@ CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_IMAGIS is not set
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
@ -1846,7 +1864,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@ -2132,12 +2149,14 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
 CONFIG_BATTERY_SBS=y
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@ -2172,6 +2191,7 @@ CONFIG_CHARGER_TPS65090=y
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
+# CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set

@ -2288,6 +2308,7 @@ CONFIG_SENSORS_PWM_FAN=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@ -2314,6 +2335,7 @@ CONFIG_SENSORS_INA2XX=y
 # CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83773G is not set
@ -2443,6 +2465,7 @@ CONFIG_MFD_MAX14577=y
 # CONFIG_MFD_MAX77650 is not set
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=y
+# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@ -2465,6 +2488,7 @@ CONFIG_MFD_MAX8998=y
 # CONFIG_MFD_RN5T618 is not set
 CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@ -2567,6 +2591,7 @@ CONFIG_REGULATOR_MAX77802=y
 # CONFIG_REGULATOR_PWM is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT6160 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
@ -2576,11 +2601,13 @@ CONFIG_REGULATOR_S2MPA01=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
 # CONFIG_REGULATOR_SLG51000 is not set
+# CONFIG_REGULATOR_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS6286X is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65090=y
@ -2623,7 +2650,6 @@ CONFIG_MEDIA_CONTROLLER=y
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@ -2645,17 +2671,17 @@ CONFIG_V4L2_ASYNC=m
 #
 # Drivers filtered as selected at 'Filter media drivers'
 #
+
+#
+# Media drivers
+#
 CONFIG_MEDIA_USB_SUPPORT=y

 #
 # Webcam devices
 #
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_GSPCA=m
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_GL860 is not set
 # CONFIG_USB_GSPCA_BENQ is not set
 # CONFIG_USB_GSPCA_CONEX is not set
 # CONFIG_USB_GSPCA_CPIA1 is not set
@ -2680,13 +2706,13 @@ CONFIG_USB_GSPCA=m
 # CONFIG_USB_GSPCA_SN9C20X is not set
 # CONFIG_USB_GSPCA_SONIXB is not set
 # CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
 # CONFIG_USB_GSPCA_SPCA500 is not set
 # CONFIG_USB_GSPCA_SPCA501 is not set
 # CONFIG_USB_GSPCA_SPCA505 is not set
 # CONFIG_USB_GSPCA_SPCA506 is not set
 # CONFIG_USB_GSPCA_SPCA508 is not set
 # CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
 # CONFIG_USB_GSPCA_SQ905 is not set
 # CONFIG_USB_GSPCA_SQ905C is not set
 # CONFIG_USB_GSPCA_SQ930X is not set
@ -2702,12 +2728,16 @@ CONFIG_USB_GSPCA=m
 # CONFIG_USB_GSPCA_VICAM is not set
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 # CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_STV06XX is not set
 # CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
+# CONFIG_USB_STKWEBCAM is not set
 # CONFIG_VIDEO_USBTV is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_ZR364XX is not set

 #
 # Webcam, TV (analog/digital) USB devices
@ -2723,25 +2753,113 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 # Media ancillary drivers
 #

+#
+# Camera sensor devices
+#
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
+# CONFIG_VIDEO_HI847 is not set
+# CONFIG_VIDEO_IMX208 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OG01A1B is not set
+# CONFIG_VIDEO_OV02A10 is not set
+# CONFIG_VIDEO_OV08D10 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
+# CONFIG_VIDEO_OV2640 is not set
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+CONFIG_VIDEO_S5C73M3=m
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+CONFIG_VIDEO_S5K6A3=m
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
 #
 # Audio decoders, processors and mixers
 #
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_CS3308 is not set
 # CONFIG_VIDEO_CS5345 is not set
 # CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_TDA1997X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
 # end of Audio decoders, processors and mixers

 #
@ -2761,7 +2879,9 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 # CONFIG_VIDEO_BT819 is not set
 # CONFIG_VIDEO_BT856 is not set
 # CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
@ -2774,7 +2894,6 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 # CONFIG_VIDEO_TW9906 is not set
 # CONFIG_VIDEO_TW9910 is not set
 # CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_MAX9286 is not set

 #
 # Video and audio decoders
@ -2786,15 +2905,15 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 #
 # Video encoders
 #
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
 # CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_THS8200 is not set
 # end of Video encoders

@ -2819,106 +2938,16 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 #
 # Miscellaneous helper chips
 #
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_ST_MIPID02 is not set
+# CONFIG_VIDEO_THS7303 is not set
 # end of Miscellaneous helper chips

-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_IMX208 is not set
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX334 is not set
-# CONFIG_VIDEO_IMX335 is not set
-# CONFIG_VIDEO_IMX355 is not set
-# CONFIG_VIDEO_IMX412 is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV8865 is not set
-# CONFIG_VIDEO_OV9282 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_OV13B10 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RDACM20 is not set
-# CONFIG_VIDEO_RDACM21 is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-CONFIG_VIDEO_S5K6A3=m
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_CCS is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-CONFIG_VIDEO_S5C73M3=m
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9768 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
 #
 # Media SPI Adapters
 #
+# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 # end of Media ancillary drivers

@ -2932,6 +2961,7 @@ CONFIG_DRM_DP_AUX_BUS=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_DP_HELPER=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@ -3026,6 +3056,7 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=y
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
@ -3056,7 +3087,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@ -3079,6 +3109,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@ -3116,6 +3147,7 @@ CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_PANEL_MIPI_DBI is not set
 # CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@ -3133,6 +3165,7 @@ CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
@ -3347,6 +3380,7 @@ CONFIG_SND_SOC_WM_HUBS=y
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@ -3432,6 +3466,7 @@ CONFIG_SND_SOC_RT5631=y
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@ -3579,12 +3614,14 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_STEAM is not set
@ -4164,7 +4201,6 @@ CONFIG_VT6656=m
 # Analog to digital converters
 #
 # CONFIG_AD7816 is not set
-# CONFIG_AD7280 is not set
 # end of Analog to digital converters

 #
@ -4206,15 +4242,8 @@ CONFIG_VT6656=m
 # end of IIO staging drivers

 # CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# end of Android
-
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
-# CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
@ -4248,10 +4277,10 @@ CONFIG_COMMON_CLK_MAX77686=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_LAN966X is not set
 CONFIG_COMMON_CLK_S2MPS11=y
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_COMMON_CLK_SAMSUNG=y
@ -4429,6 +4458,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADXL345_SPI is not set
 # CONFIG_ADXL355_I2C is not set
 # CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@ -4468,6 +4499,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
@ -4539,6 +4571,7 @@ CONFIG_EXYNOS_ADC=y
 # Amplifiers
 #
 # CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers

@ -4595,6 +4628,7 @@ CONFIG_EXYNOS_ADC=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
@ -4649,6 +4683,7 @@ CONFIG_EXYNOS_ADC=y
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADMV1013 is not set
+# CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@ -4866,6 +4901,8 @@ CONFIG_AK8975=y
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
@ -4930,10 +4967,8 @@ CONFIG_GENERIC_PHY=y

 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_LAN966X_SERDES is not set
@ -4989,6 +5024,7 @@ CONFIG_PM_OPP=y
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
+# CONFIG_PECI is not set
 # end of Device Drivers

 #
@ -5336,6 +5372,7 @@ CONFIG_CRYPTO_SIMD=m
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
@ -5519,6 +5556,7 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@ -5570,7 +5608,6 @@ CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_DMA_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set

@ -5640,16 +5677,20 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options

+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
 #
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
@ -5678,9 +5719,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments

-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
 #
 # Networking Debugging
 #
@ -5901,7 +5939,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@ -5918,7 +5955,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
--- a/projects/Samsung/patches/linux/samsung-0004-MEMEKA-media-s5p-jpeg-Enable-decoding-with-multiple-.patch
+++ b/projects/Samsung/patches/linux/samsung-0004-MEMEKA-media-s5p-jpeg-Enable-decoding-with-multiple-.patch
@ -9,10 +9,10 @@ Signed-off-by: memeka <mihailescu2m@gmail.com>
 drivers/media/platform/s5p-jpeg/jpeg-core.c | 45 ++++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

-diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
+diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
 index 86bda3947110..3015a9c350f2 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
-+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
+--- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -1797,6 +1797,31 @@ static int exynos3250_jpeg_try_crop(struct s5p_jpeg_ctx *ctx,
  * V4L2 controls
  */
--- a/projects/Samsung/patches/linux/samsung-0005-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch
+++ b/projects/Samsung/patches/linux/samsung-0005-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch
@ -8,10 +8,10 @@ Signed-off-by: memeka <mihailescu2m@gmail.com>
 drivers/media/platform/exynos-gsc/gsc-core.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
+diff --git a/drivers/media/platform/samsung/exynos-gsc/gsc-core.h b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h
 index 8e5a9acb78aa..235d687614f0 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
-+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
+--- a/drivers/media/platform/samsung/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h
@@ -474,9 +474,9 @@ static inline struct gsc_frame *ctx_get_frame(struct gsc_ctx *ctx,
 {
 	struct gsc_frame *frame;
--- a/projects/Samsung/patches/linux/samsung-0010-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch
+++ b/projects/Samsung/patches/linux/samsung-0010-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch
@ -9,10 +9,10 @@ Signed-off-by: memeka <mihailescu2m@gmail.com>
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

-diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
 index 912fe0c5ab18..d48e7b57d96a 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
-+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1208,6 +1208,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
 {
 	struct s5p_mfc_dev *dev = ctx->dev;
--- a/projects/Samsung/patches/linux/samsung-0011-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch
+++ b/projects/Samsung/patches/linux/samsung-0011-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch
@ -11,10 +11,10 @@ Signed-off-by: memeka <mihailescu2m@gmail.com>
 drivers/media/platform/s5p-mfc/s5p_mfc.c | 5 +++++
 1 file changed, 5 insertions(+)

-diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
+diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
 index 37f2113a00ec..8c39528be39e 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
-+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
+--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
@@ -941,6 +941,11 @@ static int s5p_mfc_release(struct file *file)
 	mfc_debug_enter();
 	if (dev)