update arm/arm64 configs and patches for 6.4

diff --git a/kernel-arm.config b/kernel-arm.config
index 97e08bc5ac5734bd6940f41871b5ef0d03f632ec..f7376ec8c16fcf510abc94d491db0dee71f0a893 100644 (file)
--- a/kernel-arm.config
+++ b/kernel-arm.config
@@ -49,7 +49,6 @@ ARCH_AIROHA arm=n
 #- file arch/arm/mach-omap1/Kconfig goes here
 #- file arch/arm/mach-omap2/Kconfig goes here
 #- file arch/arm/mach-orion5x/Kconfig goes here
-#- file arch/arm/mach-oxnas/Kconfig goes here
 #- file arch/arm/mach-pxa/Kconfig goes here
 #- file arch/arm/mach-qcom/Kconfig goes here
 #- file arch/arm/mach-rda/Kconfig goes here
@@ -318,11 +317,6 @@ SOC_DRA7XX arm=n
 #- OMAP Core Type
 #- OMAP Legacy Platform Data Board Type
 
-#-
-#- *** FILE: arch/arm/mach-oxnas/Kconfig ***
-#-
-ARCH_OXNAS arm=n
-
 #-
 #- *** FILE: arch/arm/mach-pxa/Kconfig ***
 #-

diff --git a/kernel-arm64.config b/kernel-arm64.config
index 527fb9afe331b89e67c06e43142cdd3dfe045aff..2b4c5d7cc011320d8818a36e7a5e0e985a88ca21 100644 (file)
--- a/kernel-arm64.config
+++ b/kernel-arm64.config
@@ -42,6 +42,7 @@ QCOM_FALKOR_ERRATUM_1009 arm64=y
 QCOM_QDF2400_ERRATUM_0065 arm64=y
 QCOM_FALKOR_ERRATUM_E1041 arm64=y
 NVIDIA_CARMEL_CNP_ERRATUM arm64=y
+ROCKCHIP_ERRATUM_3588001 arm64=y
 SOCIONEXT_SYNQUACER_PREITS arm64=y
 ARM64_4K_PAGES arm64=y
 ARM64_16K_PAGES arm64=n

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index fc1ad3375252ecb9e56c4d5818399df98c69a35d..effb8ca5a9b334ed756795b5ec76dc8031eec889 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -855,6 +855,18 @@ MHI_BUS all=m
 MHI_BUS_DEBUG all=n
 MHI_BUS_PCI_GENERIC all=m
 
+#-
+#- *** FILE: drivers/cdx/Kconfig ***
+#-
+CDX_BUS arm64=y
+#- file drivers/cdx/controller/Kconfig goes here
+
+#-
+#- *** FILE: drivers/cdx/controller/Kconfig ***
+#-
+CDX_CONTROLLER arm64=m
+MCDI_LOGGING arm64=n
+
 #-
 #- *** FILE: drivers/char/Kconfig ***
 #-
@@ -1012,6 +1024,7 @@ COMMON_CLK_XGENE arm64=y
 COMMON_CLK_PWM all=m
 COMMON_CLK_OXNAS all=n
 COMMON_CLK_RS9_PCIE arm=m arm64=m
+COMMON_CLK_SI521XX arm=m arm64=m
 COMMON_CLK_VC5 arm=m arm64=m
 COMMON_CLK_VC7 arm=m arm64=m
 COMMON_CLK_FIXED_MMIO arm=n arm64=n
@@ -2033,6 +2046,7 @@ DRM_NWL_MIPI_DSI arm=m arm64=m
 DRM_NXP_PTN3460 arm=m arm64=m
 DRM_PARADE_PS8622 arm=m arm64=m
 DRM_PARADE_PS8640 arm=m arm64=m
+DRM_SAMSUNG_DSIM arm=m arm64=m
 DRM_SIL_SII8620 arm=m arm64=m
 DRM_SII902X arm=m arm64=m
 DRM_SII9234 arm=m arm64=m
@@ -2262,12 +2276,14 @@ DRM_PANEL_LEADTEK_LTK500HD1829 arm=m arm64=m
 DRM_PANEL_SAMSUNG_LD9040 arm=m arm64=m
 DRM_PANEL_LG_LB035Q02 arm=m arm64=m
 DRM_PANEL_LG_LG4573 arm=m arm64=m
+DRM_PANEL_MAGNACHIP_D53E6EA8966 arm=m arm64=m
 DRM_PANEL_NEC_NL8048HL11 arm=m arm64=m
 DRM_PANEL_NEWVISION_NV3051D arm=m arm64=m
 DRM_PANEL_NEWVISION_NV3052C arm=m arm64=m
 DRM_PANEL_NOVATEK_NT35510 arm=m arm64=m
 DRM_PANEL_NOVATEK_NT35560 arm=m arm64=m
 DRM_PANEL_NOVATEK_NT35950 arm=m arm64=m
+DRM_PANEL_NOVATEK_NT36523 arm=m arm64=m
 DRM_PANEL_NOVATEK_NT36672A arm=m arm64=m
 DRM_PANEL_NOVATEK_NT39016 arm=m arm64=m
 DRM_PANEL_MANTIX_MLAF057WE51 arm=m arm64=m
@@ -2301,6 +2317,7 @@ DRM_PANEL_SITRONIX_ST7701 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7703 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7789V arm=m arm64=m
 DRM_PANEL_SONY_ACX565AKM arm=m arm64=m
+DRM_PANEL_SONY_TD4353_JDI arm=m arm64=m
 DRM_PANEL_SONY_TULIP_TRULY_NT35521 arm=m arm64=m
 DRM_PANEL_TDO_TL070WSH30 arm=m arm64=m
 DRM_PANEL_TPO_TD028TTEC1 arm=m arm64=m
@@ -5796,6 +5813,7 @@ MFD_CROS_EC_DEV all=m
 MFD_MADERA all=m
 MFD_MADERA_I2C all=m
 MFD_MADERA_SPI all=m
+MFD_MAX597X arm=m arm64=m
 MFD_CS47L15 all=y
 MFD_CS47L35 all=y
 MFD_CS47L85 all=y
@@ -8915,6 +8933,7 @@ ARM_CCN arm=m arm64=m
 ARM_CMN arm64=m
 ARM_PMU arm=y arm64=y
 ARM_SMMU_V3_PMU arm64=m
+ARM_PMUV3 arm=y
 ARM_DSU_PMU arm64=m
 ARM_SPE_PMU arm64=m
 ARM_DMC620_PMU arm64=m
@@ -9094,6 +9113,7 @@ PINCTRL_RK805 arm=m arm64=m
 PINCTRL_ROCKCHIP arm64=m
 PINCTRL_SINGLE arm=m arm64=m
 PINCTRL_STMFX arm=m arm64=m
+PINCTRL_MLXBF3 arm64=m
 #- file drivers/pinctrl/actions/Kconfig goes here
 #- file drivers/pinctrl/aspeed/Kconfig goes here
 #- file drivers/pinctrl/bcm/Kconfig goes here
@@ -9728,6 +9748,7 @@ REGULATOR_LTC3589 all=m
 REGULATOR_LTC3676 all=m
 REGULATOR_MAX14577 all=m
 REGULATOR_MAX1586 all=m
+REGULATOR_MAX597X arm=m arm64=m
 REGULATOR_MAX77650 arm=m arm64=m
 REGULATOR_MAX8649 all=m
 REGULATOR_MAX8660 all=m
@@ -10376,6 +10397,7 @@ SPI_MEM arm=y arm64=y
 #- SPI Master Controller Drivers
 SPI_ALTERA all=m
 SPI_ALTERA_DFL all=m
+SPI_AMLOGIC_SPIFC_A1 arm64=m
 SPI_ARMADA_3700 arm=m
 SPI_AXI_SPI_ENGINE all=m
 SPI_BCM2835 arm=m
@@ -10861,6 +10883,7 @@ AMDTEE all=m
 #- *** FILE: drivers/tee/optee/Kconfig ***
 #-
 OPTEE arm=m arm64=m
+OPTEE_INSECURE_LOAD_IMAGE arm64=n
 
 #-
 #- *** FILE: drivers/thermal/Kconfig ***
@@ -11620,6 +11643,7 @@ TYPEC_UCSI all=m
 UCSI_CCG all=m
 UCSI_ACPI all=m
 UCSI_STM32G0 all=m
+UCSI_PMIC_GLINK arm=m arm64=m
 
 #-
 #- *** FILE: drivers/usb/usbip/Kconfig ***
@@ -15431,6 +15455,7 @@ SND_SOC_ICS43432 all=m
 SND_SOC_IDT821034 all=m
 SND_SOC_INNO_RK3036 all=m
 SND_SOC_MAX98088 all=m
+SND_SOC_MAX98090 arm=m
 SND_SOC_MAX98095 all=m
 SND_SOC_MAX98357A all=m
 SND_SOC_MAX98504 all=m

diff --git a/rkvdec-hevc.patch b/rkvdec-hevc.patch
index c7a1175df00334368b84a1d208505d6c6ed4a23c..69b8fae2a33d79abed4e57ff6a74404b168329e8 100644 (file)
--- a/rkvdec-hevc.patch
+++ b/rkvdec-hevc.patch
@@ -216,7 +216,7 @@ index 8e0a0ff62a70..1c80ad78ef00 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1343,6 +1343,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
-       case V4L2_PIX_FMT_M420:         descr = "YUV 4:2:0 (M420)"; break;
+       case V4L2_PIX_FMT_YUV48_12:     descr = "12-bit YUV 4:4:4 Packed"; break;
        case V4L2_PIX_FMT_NV12:         descr = "Y/UV 4:2:0"; break;
        case V4L2_PIX_FMT_NV21:         descr = "Y/VU 4:2:0"; break;
 +      case V4L2_PIX_FMT_NV15:         descr = "10-bit Y/UV 4:2:0 (Packed)"; break;