From 0592a12cb4160ddda28358878917300df392c354 Mon Sep 17 00:00:00 2001
From: Jan Palus <jpalus@fastmail.com>
Date: Mon, 8 Aug 2022 10:16:42 +0200
Subject: [PATCH] updated arm/arm64 configs and patches for 5.19

---
 kernel-arm.config         | 76 +++++++++++++++++++++++++++++----------
 kernel-arm64.config       |  3 ++
 kernel-multiarch.config   | 17 +++++++--
 kernel-pinebook-pro.patch |  8 ++---
 4 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/kernel-arm.config b/kernel-arm.config
index 22a37bb7..8f1ad131 100644
--- a/kernel-arm.config
+++ b/kernel-arm.config
@@ -5,16 +5,9 @@
 ARM_DMA_IOMMU_ALIGNMENT arm=8
 MMU arm=y
 ARCH_MULTIPLATFORM arm=y
-ARCH_EP93XX arm=n
 ARCH_FOOTBRIDGE arm=n
-ARCH_IOP32X arm=n
-ARCH_IXP4XX arm=n
-ARCH_DOVE arm=n
-ARCH_PXA arm=n
 ARCH_RPC arm=n
 ARCH_SA1100 arm=n
-ARCH_S3C24XX arm=n
-ARCH_OMAP1 arm=n
 #- CPU Core family selection
 ARCH_MULTI_V6 armv6l=y armv6hl=y armv7l=n armv7hl=n armv7hnl=n
 ARCH_MULTI_V7 armv6l=y armv6hl=y armv7l=y armv7hl=y armv7hnl=y
@@ -40,8 +33,8 @@ ARCH_AIROHA arm=n
 #- file arch/arm/mach-gemini/Kconfig goes here
 #- file arch/arm/mach-highbank/Kconfig goes here
 #- file arch/arm/mach-hisi/Kconfig goes here
+#- file arch/arm/mach-hpe/Kconfig goes here
 #- file arch/arm/mach-imx/Kconfig goes here
-#- file arch/arm/mach-integrator/Kconfig goes here
 #- file arch/arm/mach-iop32x/Kconfig goes here
 #- file arch/arm/mach-ixp4xx/Kconfig goes here
 #- file arch/arm/mach-keystone/Kconfig goes here
@@ -58,17 +51,14 @@ ARCH_AIROHA arm=n
 #- file arch/arm/mach-nomadik/Kconfig goes here
 #- file arch/arm/mach-npcm/Kconfig goes here
 #- file arch/arm/mach-nspire/Kconfig goes here
-#- file arch/arm/plat-omap/Kconfig goes here
 #- 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/plat-pxa/Kconfig goes here
 #- file arch/arm/mach-qcom/Kconfig goes here
 #- file arch/arm/mach-rda/Kconfig goes here
 #- file arch/arm/mach-realtek/Kconfig goes here
-#- file arch/arm/mach-realview/Kconfig goes here
 #- file arch/arm/mach-rockchip/Kconfig goes here
 #- file arch/arm/mach-s3c/Kconfig goes here
 #- file arch/arm/mach-s5pv210/Kconfig goes here
@@ -83,7 +73,6 @@ ARCH_AIROHA arm=n
 #- file arch/arm/mach-uniphier/Kconfig goes here
 #- file arch/arm/mach-ux500/Kconfig goes here
 #- file arch/arm/mach-versatile/Kconfig goes here
-#- file arch/arm/mach-vexpress/Kconfig goes here
 #- file arch/arm/mach-vt8500/Kconfig goes here
 #- file arch/arm/mach-zynq/Kconfig goes here
 #- file arch/arm/mm/Kconfig goes here
@@ -95,6 +84,7 @@ ARM_ERRATA_720789 arm=y
 ARM_ERRATA_754322 arm=y
 ARM_ERRATA_754327 arm=y
 ARM_ERRATA_764369 arm=y
+ARM_ERRATA_764319 arm=n
 ARM_ERRATA_775420 arm=y
 ARM_ERRATA_798181 arm=y
 ARM_ERRATA_773022 arm=y
@@ -226,6 +216,7 @@ ARCH_BCM2835 arm=y
 ARCH_BCM_53573 arm=n
 ARCH_BCM_63XX arm=n
 ARCH_BRCMSTB arm=n
+ARCH_BCMBCA arm=n
 
 #-
 #- *** FILE: arch/arm/mach-berlin/Kconfig ***
@@ -242,6 +233,17 @@ ARCH_CNS3XXX arm=n
 #-
 ARCH_DIGICOLOR arm=n
 
+#-
+#- *** FILE: arch/arm/mach-dove/Kconfig ***
+#-
+ARCH_DOVE arm=n
+
+#-
+#- *** FILE: arch/arm/mach-ep93xx/Kconfig ***
+#-
+ARCH_EP93XX arm=n
+#- EP93xx Platforms
+
 #-
 #- *** FILE: arch/arm/mach-exynos/Kconfig ***
 #-
@@ -258,6 +260,11 @@ ARCH_HIGHBANK arm=n
 #-
 ARCH_HISI arm=n
 
+#-
+#- *** FILE: arch/arm/mach-hpe/Kconfig ***
+#-
+ARCH_HPE arm=n
+
 #-
 #- *** FILE: arch/arm/mach-imx/Kconfig ***
 #-
@@ -267,9 +274,14 @@ ARCH_MXC arm=n
 #- Cortex-A/Cortex-M asymmetric multiprocessing platforms
 
 #-
-#- *** FILE: arch/arm/mach-integrator/Kconfig ***
+#- *** FILE: arch/arm/mach-iop32x/Kconfig ***
 #-
-ARCH_INTEGRATOR arm=n
+ARCH_IOP32X arm=n
+
+#-
+#- *** FILE: arch/arm/mach-ixp4xx/Kconfig ***
+#-
+ARCH_IXP4XX arm=n
 
 #-
 #- *** FILE: arch/arm/mach-keystone/Kconfig ***
@@ -317,6 +329,14 @@ MACH_DOVE arm=n
 #-
 ARCH_NPCM arm=n
 
+#-
+#- *** FILE: arch/arm/mach-omap1/Kconfig ***
+#-
+ARCH_OMAP1 arm=n
+#- OMAP Core Type
+#- OMAP Feature Selections
+#- OMAP Board Type
+
 #-
 #- *** FILE: arch/arm/mach-omap2/Kconfig ***
 #-
@@ -335,6 +355,14 @@ SOC_DRA7XX arm=n
 #-
 ARCH_OXNAS arm=n
 
+#-
+#- *** FILE: arch/arm/mach-pxa/Kconfig ***
+#-
+ARCH_PXA arm=n
+#- Intel/Marvell Dev Platforms (sorted by hardware release time)
+#- Third Party Dev Platforms (sorted by vendor name)
+#- End-user Products (sorted by vendor name)
+
 #-
 #- *** FILE: arch/arm/mach-qcom/Kconfig ***
 #-
@@ -351,14 +379,21 @@ ARCH_RDA arm=n
 ARCH_REALTEK arm=n
 
 #-
-#- *** FILE: arch/arm/mach-realview/Kconfig ***
+#- *** FILE: arch/arm/mach-rockchip/Kconfig ***
 #-
-ARCH_REALVIEW arm=n
+ARCH_ROCKCHIP arm=n
 
 #-
-#- *** FILE: arch/arm/mach-rockchip/Kconfig ***
+#- *** FILE: arch/arm/mach-s3c/Kconfig.s3c24xx ***
 #-
-ARCH_ROCKCHIP arm=n
+ARCH_S3C24XX arm=n
+#- S3C24XX SoCs
+#- S3C2410 Boards
+#- S3C2412 Boards
+#- S3C2416 Boards
+#- S3C2440 Boards
+#- S3C2442 Boards
+#- S3C2443 Boards
 
 #-
 #- *** FILE: arch/arm/mach-s3c/Kconfig.s3c64xx ***
@@ -416,8 +451,10 @@ ARCH_UNIPHIER arm=n
 ARCH_U8500 arm=n
 
 #-
-#- *** FILE: arch/arm/mach-vexpress/Kconfig ***
+#- *** FILE: arch/arm/mach-versatile/Kconfig ***
 #-
+ARCH_INTEGRATOR arm=n
+ARCH_REALVIEW arm=n
 ARCH_VEXPRESS arm=n
 
 #-
@@ -439,6 +476,7 @@ ARCH_ZYNQ arm=n
 ARM_LPAE arm=n
 ARM_THUMBEE arm=n
 SWP_EMULATE arm=y
+CPU_LITTLE_ENDIAN arm=y
 CPU_BIG_ENDIAN arm=n
 CPU_ICACHE_DISABLE arm=n
 CPU_ICACHE_MISMATCH_WORKAROUND arm=y
diff --git a/kernel-arm64.config b/kernel-arm64.config
index a07c7f66..f9657fd2 100644
--- a/kernel-arm64.config
+++ b/kernel-arm64.config
@@ -83,6 +83,7 @@ ARCH_RANDOM arm64=y
 ARM64_MTE arm64=y
 ARM64_EPAN arm64=y
 ARM64_SVE arm64=y
+ARM64_SME arm64=y
 ARM64_MODULE_PLTS arm64=y
 ARM64_PSEUDO_NMI arm64=n
 RANDOMIZE_BASE arm64=y
@@ -152,6 +153,8 @@ CRYPTO_SHA512_ARM64_CE arm64=m
 CRYPTO_SHA3_ARM64 arm64=m
 CRYPTO_SM3_ARM64_CE arm64=m
 CRYPTO_SM4_ARM64_CE arm64=m
+CRYPTO_SM4_ARM64_CE_BLK arm64=m
+CRYPTO_SM4_ARM64_NEON_BLK arm64=m
 CRYPTO_GHASH_ARM64_CE arm64=m
 CRYPTO_CRCT10DIF_ARM64_CE arm64=m
 CRYPTO_AES_ARM64 arm64=m
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 424e92cf..417956e4 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1980,8 +1980,10 @@ DRM_CHIPONE_ICN6211 arm=m arm64=m
 DRM_CHRONTEL_CH7033 arm=m arm64=m
 DRM_CROS_EC_ANX7688 arm=m arm64=m
 DRM_DISPLAY_CONNECTOR arm=m arm64=m
+DRM_FSL_LDB arm=m arm64=m
 DRM_ITE_IT6505 arm=m arm64=m
 DRM_LONTIUM_LT8912B arm=m arm64=m
+DRM_LONTIUM_LT9211 arm=m arm64=m
 DRM_LONTIUM_LT9611 arm=m arm64=m
 DRM_LONTIUM_LT9611UXC arm=m arm64=m
 DRM_ITE_IT66121 arm=m arm64=m
@@ -2034,6 +2036,7 @@ DRM_CDNS_MHDP8546 arm=m arm64=m
 #-
 DRM_DW_HDMI_AHB_AUDIO arm=m arm64=m
 DRM_DW_HDMI_I2S_AUDIO arm=m arm64=m
+DRM_DW_HDMI_GP_AUDIO arm=m arm64=m
 DRM_DW_HDMI_CEC arm=m arm64=m
 
 #-
@@ -2209,6 +2212,7 @@ 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_NEC_NL8048HL11 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
@@ -2286,6 +2290,8 @@ DRM_RCAR_MIPI_DSI arm=m arm64=m
 #- *** FILE: drivers/gpu/drm/rockchip/Kconfig ***
 #-
 DRM_ROCKCHIP arm64=m
+ROCKCHIP_VOP arm64=y
+ROCKCHIP_VOP2 arm64=y
 ROCKCHIP_ANALOGIX_DP arm64=y
 ROCKCHIP_CDN_DP arm64=y
 ROCKCHIP_DW_HDMI arm64=y
@@ -4232,6 +4238,7 @@ SERIAL_IPOCTAL all=m
 AL_FIC arm=n arm64=n
 BRCMSTB_L2_IRQ arm=m
 TS4800_IRQ all=m
+XILINX_INTC arm=n arm64=n
 MESON_IRQ_GPIO arm64=m
 
 #-
@@ -4372,6 +4379,7 @@ LEDS_SGM3140 all=m
 #- *** FILE: drivers/leds/rgb/Kconfig ***
 #-
 LEDS_PWM_MULTICOLOR all=m
+LEDS_QCOM_LPG arm=m arm64=m
 
 #-
 #- *** FILE: drivers/leds/simple/Kconfig ***
@@ -6397,6 +6405,7 @@ CAN_CC770_PLATFORM all=m
 #- *** FILE: drivers/net/can/ctucanfd/Kconfig ***
 #-
 CAN_CTUCANFD_PCI all=m
+CAN_CTUCANFD_PLATFORM arm=m arm64=m
 
 #-
 #- *** FILE: drivers/net/can/ifi_canfd/Kconfig ***
@@ -9355,6 +9364,7 @@ PWM_RASPBERRYPI_POE arm=m
 PWM_ROCKCHIP arm64=m
 PWM_SL28CPLD all=m
 PWM_STMPE arm=n arm64=n
+PWM_XILINX arm=m arm64=m
 
 #-
 #- *** FILE: drivers/rapidio/Kconfig ***
@@ -14747,6 +14757,7 @@ SND_VIRMIDI all=m
 SND_MTPAV all=m
 SND_MTS64 all=m
 SND_SERIAL_U16550 all=m
+SND_SERIAL_GENERIC arm=m arm64=m
 SND_MPU401 all=m
 SND_PORTMAN2X4 all=m
 SND_AC97_POWER_SAVE all=y
@@ -15037,6 +15048,9 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
 #-
 SND_BCM2835_SOC_I2S arm=m
 SND_BCM63XX_I2S_WHISTLER all=m
+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
 
 #-
 #- *** FILE: sound/soc/codecs/Kconfig ***
@@ -15688,9 +15702,6 @@ SATA_DWC_DEBUG all=n
 SBNI i386=m x86_64=m
 SBNI_MULTILINE i386=y x86_64=y
 SENSORS_AMD_ENERGY all=m
-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
 SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
 SND_SOC_ZX_AUD96P22 all=m
 SPI_INTEL_SPI_PCI all=m
diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch
index 73d69c20..8ed14538 100644
--- a/kernel-pinebook-pro.patch
+++ b/kernel-pinebook-pro.patch
@@ -258,8 +258,8 @@ index 000000000000..143ff2486f2f
 +
 +	/* consumers */
 +	struct usb_role_switch *role_sw;
-+        struct typec_switch *sw;
-+        struct typec_mux *mux;
++        struct typec_switch_dev *sw;
++        struct typec_mux_dev *mux;
 +
 +	/* providers */
 +	struct extcon_dev *extcon;
@@ -374,7 +374,7 @@ index 000000000000..143ff2486f2f
 +	return 0;
 +}
 +
-+static int typec_extcon_sw_set(struct typec_switch *sw,
++static int typec_extcon_sw_set(struct typec_switch_dev *sw,
 +			       enum typec_orientation orientation)
 +{
 +        struct typec_extcon *tce = typec_switch_get_drvdata(sw);
@@ -390,7 +390,7 @@ index 000000000000..143ff2486f2f
 +        return 0;
 +}
 +
-+static int typec_extcon_mux_set(struct typec_mux *mux,
++static int typec_extcon_mux_set(struct typec_mux_dev *mux,
 +				struct typec_mux_state *state)
 +{
 +        struct typec_extcon *tce = typec_mux_get_drvdata(mux);
-- 
2.44.0