Bump Meson64 current to 5.10.y (#2544)

2025-09-24 19:47:06 +07:00 · 2021-01-14 01:36:40 +01:00
parent 555171ac09
commit fc9c312f79
24 changed files with 226 additions and 374 deletions
--- a/config/kernel/linux-meson64-current.config
+++ b/config/kernel/linux-meson64-current.config
@@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.9.12 Kernel Configuration
+# Linux/arm64 5.10.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80300
 CONFIG_LD_VERSION=232000000
 CONFIG_CLANG_VERSION=0
+CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -50,6 +51,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
@@ -184,6 +186,7 @@ CONFIG_RD_ZSTD=y
 # CONFIG_BOOT_CONFIG is not set
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -219,6 +222,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_BPF_JIT_DEFAULT_ON=y
+# CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -254,7 +258,8 @@ CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_ARCH_MMAP_RND_BITS_MAX=33
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
@@ -316,6 +321,7 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_THUNDER2 is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
@@ -347,6 +353,7 @@ CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -398,7 +405,6 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -408,8 +414,6 @@ CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -482,6 +486,7 @@ CONFIG_DMI=y

 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y

 #
 # Power management options
@@ -583,13 +588,15 @@ CONFIG_DMIID=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_GENERIC_STUB=y
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
@@ -599,6 +606,7 @@ CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 CONFIG_MESON_SM=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
@@ -651,11 +659,11 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_WATCHDOG=y
-# CONFIG_PMIC_OPREGION is not set
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
 CONFIG_ACPI_PPTT=y
+# CONFIG_PMIC_OPREGION is not set
 CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
@@ -672,7 +680,6 @@ CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_KVM_ARM_PMU=y
-CONFIG_KVM_INDIRECT_VECTORS=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
@@ -699,6 +706,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 #
 CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
+CONFIG_SET_FS=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -732,7 +740,9 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
@@ -741,6 +751,7 @@ CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -766,6 +777,7 @@ 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_ARCH_WANT_LD_ORPHAN_WARN=y

 #
 # GCOV-based kernel profiling
@@ -928,7 +940,6 @@ CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
 CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@@ -1669,7 +1680,7 @@ CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_QRTR=m
 # CONFIG_QRTR_SMD is not set
 # CONFIG_QRTR_TUN is not set
-# CONFIG_QRTR_MHI is not set
+CONFIG_QRTR_MHI=m
 # CONFIG_NET_NCSI is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
@@ -1686,7 +1697,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1716,6 +1726,7 @@ CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
 CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m

 #
 # CAN Device Drivers
@@ -1757,6 +1768,8 @@ CONFIG_CAN_SOFTING=m
 #
 CONFIG_CAN_HI311X=m
 CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
 # end of CAN SPI interfaces

 #
@@ -1971,6 +1984,11 @@ CONFIG_PCI_IOV=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
@@ -1991,6 +2009,7 @@ CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_HISI_ERR is not set

 #
 # DesignWare PCI Core Support
@@ -2074,6 +2093,7 @@ CONFIG_REGMAP_W1=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_SPI_AVMM=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -2087,6 +2107,7 @@ CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
 # end of Bus devices

 CONFIG_CONNECTOR=m
@@ -2212,6 +2233,12 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+# end of ECC engine support
 # end of NAND

 #
@@ -2235,7 +2262,6 @@ CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2313,6 +2339,7 @@ CONFIG_PCI_ENDPOINT_TEST=m
 # CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 # CONFIG_PVPANIC is not set
+CONFIG_HISI_HIKEY_USB=m
 CONFIG_KHADAS_FAN=m
 # CONFIG_KHADAS_MCU is not set
 # CONFIG_C2PORT is not set
@@ -2342,13 +2369,6 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y

 # CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-# CONFIG_VOP_BUS is not set
-# end of Intel MIC & related support
-
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 # CONFIG_ECHO is not set
@@ -2705,6 +2725,7 @@ CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MSCC_SEVILLE=m
 CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_SJA1105=m
 # CONFIG_NET_DSA_SJA1105_PTP is not set
@@ -2842,6 +2863,8 @@ CONFIG_OCTEONTX2_MBOX=m
 # CONFIG_OCTEONTX2_AF is not set
 CONFIG_OCTEONTX2_PF=m
 CONFIG_OCTEONTX2_VF=m
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX5_CORE is not set
@@ -2928,6 +2951,7 @@ CONFIG_STMMAC_PLATFORM=y
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_INTEL_PLAT=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_HAPPYMEAL is not set
@@ -2953,62 +2977,36 @@ CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_SB1000 is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_BUS_MUX=y
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-CONFIG_MDIO_BUS_MUX_MESON_G12A=y
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-CONFIG_MDIO_CAVIUM=y
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_I2C=m
-CONFIG_MDIO_IPQ4019=m
-CONFIG_MDIO_IPQ8064=m
-CONFIG_MDIO_MSCC_MIIM=m
-CONFIG_MDIO_MVUSB=m
-# CONFIG_MDIO_OCTEON is not set
-CONFIG_MDIO_THUNDER=y
-CONFIG_MDIO_XPCS=y
 CONFIG_PHYLINK=y
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m

 #
 # MII PHY device drivers
 #
-CONFIG_SFP=m
-CONFIG_ADIN_PHY=m
 CONFIG_AMD_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_ADIN_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AX88796B_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
 CONFIG_BROADCOM_PHY=m
 # CONFIG_BCM54140_PHY is not set
+CONFIG_BCM7XXX_PHY=m
 # CONFIG_BCM84881_PHY is not set
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
 CONFIG_CICADA_PHY=m
 # CONFIG_CORTINA_PHY is not set
 CONFIG_DAVICOM_PHY=m
-# CONFIG_DP83822_PHY is not set
-CONFIG_DP83TC811_PHY=m
-CONFIG_DP83848_PHY=m
-# CONFIG_DP83867_PHY is not set
-CONFIG_DP83869_PHY=m
-CONFIG_FIXED_PHY=y
 CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
 # CONFIG_INTEL_XWAY_PHY is not set
 CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-CONFIG_MESON_GXL_PHY=m
 CONFIG_MICREL_PHY=y
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
@@ -3020,12 +3018,50 @@ CONFIG_AT803X_PHY=m
 CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
 CONFIG_ROCKCHIP_PHY=y
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=m
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
+# CONFIG_DP83822_PHY is not set
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+# CONFIG_DP83867_PHY is not set
+CONFIG_DP83869_PHY=m
 CONFIG_VITESSE_PHY=m
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=y
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+# CONFIG_MDIO_OCTEON is not set
+CONFIG_MDIO_IPQ4019=m
+CONFIG_MDIO_IPQ8064=m
+CONFIG_MDIO_THUNDER=y
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=y
+CONFIG_MDIO_BUS_MUX_MESON_G12A=y
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=y
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -3139,6 +3175,9 @@ CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_ATH10K_DFS_CERTIFIED is not set
 # CONFIG_WCN36XX is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -3315,7 +3354,6 @@ CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EU=m
 CONFIG_RTL8821CU=m
 CONFIG_88XXAU=m
 CONFIG_RTL8192EU=m
@@ -3448,6 +3486,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_ANALOG is not set
 # CONFIG_JOYSTICK_A3D is not set
+CONFIG_JOYSTICK_ADC=m
 # CONFIG_JOYSTICK_ADI is not set
 # CONFIG_JOYSTICK_COBRA is not set
 # CONFIG_JOYSTICK_GF2K is not set
@@ -3576,6 +3615,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
 CONFIG_TOUCHSCREEN_DWAV_USB_MT=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_88PM860X_ONKEY=m
@@ -3642,6 +3682,7 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 # CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F3A is not set
 # CONFIG_RMI4_F54 is not set
 # CONFIG_RMI4_F55 is not set

@@ -3787,6 +3828,7 @@ CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_OPTEE=m
 CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
 CONFIG_APPLICOM=m
 CONFIG_DEVMEM=y
 CONFIG_RAW_DRIVER=m
@@ -3918,6 +3960,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_I2C_SLAVE_TESTUNIT=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -4037,6 +4080,12 @@ CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_PALMAS=m
 # CONFIG_PINCTRL_RK805 is not set
 # CONFIG_PINCTRL_OCELOT is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_PINCTRL_MESON_GXL=y
@@ -4058,6 +4107,8 @@ CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MAX730X=m

@@ -4199,9 +4250,6 @@ CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
 # end of 1-wire Slaves

-CONFIG_POWER_AVS=y
-CONFIG_QCOM_CPR=m
-CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_ODROID=y
 # CONFIG_POWER_RESET_AS3722 is not set
@@ -4236,7 +4284,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2781=m
 CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_LEGO_EV3=m
 CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
@@ -4278,6 +4325,7 @@ CONFIG_CHARGER_BQ24257=m
 CONFIG_CHARGER_BQ24735=m
 CONFIG_CHARGER_BQ2515X=m
 CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
 CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_TPS65090=m
 CONFIG_CHARGER_TPS65217=m
@@ -4287,6 +4335,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_UCS1002=m
 CONFIG_CHARGER_BD99954=m
+CONFIG_RN5T618_POWER=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4371,6 +4420,7 @@ CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_TC654=m
 CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
@@ -4401,6 +4451,7 @@ CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_BEL_PFE=m
 CONFIG_SENSORS_IBM_CFFPS=m
@@ -4420,6 +4471,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
@@ -4478,6 +4530,7 @@ CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m

 #
 # ACPI drivers
@@ -4731,6 +4784,7 @@ CONFIG_MFD_ROHM_BD71828=m
 CONFIG_MFD_KHADAS_MCU=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_RAVE_SP_CORE=m
+CONFIG_MFD_INTEL_M10_BMC=m
 # end of Multifunction device drivers

 CONFIG_REGULATOR=y
@@ -4805,6 +4859,7 @@ CONFIG_REGULATOR_MAX77826=m
 # CONFIG_REGULATOR_MT6311 is not set
 # CONFIG_REGULATOR_MT6323 is not set
 CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6360=m
 # CONFIG_REGULATOR_MT6397 is not set
 # CONFIG_REGULATOR_PALMAS is not set
 CONFIG_REGULATOR_PCA9450=m
@@ -4817,11 +4872,14 @@ CONFIG_REGULATOR_PFUZE100=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_QCOM_USB_VBUS=m
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
 # CONFIG_REGULATOR_RC5T583 is not set
 CONFIG_REGULATOR_RK808=y
 # CONFIG_REGULATOR_RN5T618 is not set
 CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_RT4801=m
 # CONFIG_REGULATOR_RT5033 is not set
+CONFIG_REGULATOR_RTMV20=m
 # CONFIG_REGULATOR_S2MPA01 is not set
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
@@ -5280,6 +5338,7 @@ CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
 CONFIG_VIDEO_VIM2M=m
 CONFIG_VIDEO_VICODEC=m
+# CONFIG_DVB_TEST_DRIVERS is not set
 # end of Media drivers

 #
@@ -5758,7 +5817,6 @@ CONFIG_DRM_UDL=m
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_RCAR_WRITEBACK=y
 # CONFIG_DRM_QXL is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -5789,6 +5847,7 @@ CONFIG_DRM_PANEL_LG_LB035Q02=m
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
@@ -5829,6 +5888,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_CDNS_DSI=m
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_LONTIUM_LT9611=m
 CONFIG_DRM_LVDS_CODEC=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_NWL_MIPI_DSI=m
@@ -5840,9 +5900,11 @@ CONFIG_DRM_PARADE_PS8640=m
 CONFIG_DRM_SII9234=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_THINE_THC63LVD1024=m
+CONFIG_DRM_TOSHIBA_TC358762=m
 CONFIG_DRM_TOSHIBA_TC358764=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 CONFIG_DRM_TI_TPD12S015=m
@@ -5850,6 +5912,7 @@ CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_I2C_ADV7511 is not set
+CONFIG_DRM_CDNS_MHDP8546=m
 CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -5968,6 +6031,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_HX8357 is not set
 CONFIG_LCD_OTM3225A=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
 CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_DA903X=m
@@ -6175,7 +6239,6 @@ CONFIG_SND_SOC_FSL_MICFIL=m

 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_KEEMBAY=m
 # CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
@@ -6261,6 +6324,7 @@ CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L56=m
 CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -6339,6 +6403,7 @@ CONFIG_SND_SOC_STA350=m
 CONFIG_SND_SOC_STI_SAS=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
 CONFIG_SND_SOC_TAS2770=m
 CONFIG_SND_SOC_TAS5086=m
 CONFIG_SND_SOC_TAS571X=m
@@ -6449,6 +6514,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -6557,6 +6623,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_PRODUCTLIST is not set
@@ -6773,7 +6840,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -6924,12 +6990,15 @@ CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_MT6360=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_CCG=m
 CONFIG_UCSI_ACPI=m
 CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_STUSB160X=m

 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -7027,6 +7096,7 @@ CONFIG_LEDS_MT6323=m
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP3952 is not set
+CONFIG_LEDS_LP50XX=m
 CONFIG_LEDS_LP55XX_COMMON=m
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
@@ -7169,6 +7239,7 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_SD3078=m
@@ -7329,6 +7400,7 @@ CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
 CONFIG_VDPA=m
 CONFIG_VDPA_SIM=m
 CONFIG_IFCVF=m
@@ -7450,9 +7522,15 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_HANTRO is not set
 CONFIG_VIDEO_MESON_VDEC=m
 # CONFIG_VIDEO_ROCKCHIP_VDEC is not set
-CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_ROCKCHIP_ISP1=m
-CONFIG_VIDEO_USBVISION=m

 #
 # Android
@@ -7497,7 +7575,6 @@ CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_MOST_COMPONENTS=m
-# CONFIG_MOST_CDEV is not set
 # CONFIG_MOST_NET is not set
 # CONFIG_MOST_SOUND is not set
 # CONFIG_MOST_VIDEO is not set
@@ -7518,8 +7595,10 @@ CONFIG_XIL_AXIS_FIFO=m
 # CONFIG_KPC2000 is not set
 # CONFIG_QLGE is not set
 # CONFIG_WFX is not set
+CONFIG_SPMI_HISI3670=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_REGULATOR_HI6421V600=m
 # CONFIG_GOLDFISH is not set
-CONFIG_MFD_CROS_EC=y
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CROS_EC=y
@@ -7543,7 +7622,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_WM831X=m
-# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX77686 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=y
@@ -7566,6 +7644,10 @@ CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
 CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+
+#
+# Clock support for Amlogic platforms
+#
 CONFIG_COMMON_CLK_MESON_REGMAP=y
 CONFIG_COMMON_CLK_MESON_DUALDIV=y
 CONFIG_COMMON_CLK_MESON_MPLL=y
@@ -7580,6 +7662,19 @@ CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
 CONFIG_COMMON_CLK_AXG_AUDIO=m
 CONFIG_COMMON_CLK_G12A=y
+# end of Clock support for Amlogic platforms
+
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RV110X=y
+CONFIG_CLK_RK3036=y
+CONFIG_CLK_RK312X=y
+CONFIG_CLK_RK3188=y
+CONFIG_CLK_RK322X=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
 CONFIG_HWSPINLOCK=y

 #
@@ -7629,6 +7724,7 @@ CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3=y
+# CONFIG_ARM_SMMU_V3_SVA is not set
 # CONFIG_VIRTIO_IOMMU is not set

 #
@@ -7691,9 +7787,11 @@ CONFIG_SOC_BRCMSTB=y
 #
 # Qualcomm SoC drivers
 #
+CONFIG_QCOM_QMI_HELPERS=m
 # end of Qualcomm SoC drivers

 CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_IODOMAIN=m
 # CONFIG_ROCKCHIP_PM_DOMAINS is not set
 CONFIG_SOC_TI=y

@@ -8013,6 +8111,7 @@ CONFIG_ADIS16080=m
 CONFIG_ADIS16130=m
 CONFIG_ADIS16136=m
 CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
 CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
@@ -8049,6 +8148,7 @@ CONFIG_ITG3200=m
 CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+CONFIG_HDC2010=m
 CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
@@ -8092,6 +8192,7 @@ CONFIG_AL3010=m
 CONFIG_AL3320A=m
 CONFIG_APDS9300=m
 CONFIG_APDS9960=m
+CONFIG_AS73211=m
 CONFIG_BH1750=m
 CONFIG_BH1780=m
 CONFIG_CM32181=m
@@ -8326,6 +8427,7 @@ CONFIG_RESET_SCMI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=y
+CONFIG_USB_LGM_PHY=m
 CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
 CONFIG_PHY_MESON_G12A_USB2=y
@@ -8347,6 +8449,7 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_QCOM_USB_HS=y
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
@@ -8366,6 +8469,7 @@ CONFIG_PHY_SAMSUNG_USB2=y
 #
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
+CONFIG_ARM_CMN=m
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 # CONFIG_ARM_SMMU_V3_PMU is not set
@@ -8376,6 +8480,7 @@ CONFIG_HISI_PMU=y

 CONFIG_RAS=y
 CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set

 #
 # Android
@@ -8433,6 +8538,7 @@ CONFIG_FTM_QUADDEC=m
 CONFIG_MICROCHIP_TCB_CAPTURE=m
 CONFIG_MOST=m
 CONFIG_MOST_USB_HDM=m
+# CONFIG_MOST_CDEV is not set
 # end of Device Drivers

 #
@@ -8468,6 +8574,7 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
@@ -8706,6 +8813,7 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -8947,6 +9055,7 @@ CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
 CONFIG_CRYPTO_CURVE25519=m

 #
@@ -9045,7 +9154,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
+CONFIG_CRYPTO_ZSTD=y

 #
 # Random Number Generation
@@ -9061,7 +9170,9 @@ CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_HASH_INFO=y

@@ -9225,6 +9336,7 @@ CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y

 #
 # Default contiguous memory area size:
@@ -9268,8 +9380,10 @@ CONFIG_FONT_6x10=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
 CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
@@ -9404,6 +9518,8 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+CONFIG_SCF_TORTURE_TEST=m
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

 # CONFIG_STACKTRACE is not set
@@ -9427,7 +9543,7 @@ CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 # RCU Debugging
 #
 CONFIG_TORTURE_TEST=m
-CONFIG_RCU_PERF_TEST=m
+CONFIG_RCU_SCALE_TEST=m
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_REF_SCALE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
@@ -9493,7 +9609,6 @@ CONFIG_TEST_STRSCPY=m
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_UUID is not set
 CONFIG_TEST_XARRAY=m
 # CONFIG_TEST_OVERFLOW is not set
@@ -9509,6 +9624,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
+CONFIG_BITFIELD_KUNIT=m
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_LIST_KUNIT_TEST=m
 CONFIG_LINEAR_RANGES_TEST=m
--- a/config/kernel/linux-meson64-dev.config
+++ b/config/kernel/linux-meson64-dev.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.1 Kernel Configuration
+# Linux/arm64 5.10.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -3354,7 +3354,6 @@ CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EU=m
 CONFIG_RTL8821CU=m
 CONFIG_88XXAU=m
 CONFIG_RTL8192EU=m
@@ -4111,7 +4110,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m

 #
@@ -4173,7 +4171,6 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_PALMAS is not set
 # CONFIG_GPIO_RC5T583 is not set
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS65218=m
 # CONFIG_GPIO_TPS6586X is not set
@@ -4483,7 +4480,6 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4599,7 +4595,6 @@ CONFIG_WM8350_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_RAVE_SP_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=y
 # CONFIG_ARM_SBSA_WATCHDOG is not set
 CONFIG_CADENCE_WATCHDOG=m
@@ -4729,8 +4724,6 @@ CONFIG_MFD_RK808=y
 CONFIG_MFD_RN5T618=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -6246,7 +6239,6 @@ CONFIG_SND_SOC_FSL_MICFIL=m

 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_KEEMBAY=m
 # CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
@@ -6848,7 +6840,6 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -8401,7 +8392,6 @@ CONFIG_PWM_LP3943=m
 CONFIG_PWM_MESON=y
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=m
-CONFIG_PWM_SL28CPLD=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m

@@ -9164,7 +9154,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
+CONFIG_CRYPTO_ZSTD=y

 #
 # Random Number Generation
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -28,7 +28,7 @@ case $BRANCH in
 	;;

        current)
-                KERNELBRANCH='branch:linux-5.9.y'
+                KERNELBRANCH='branch:linux-5.10.y'
                KERNELPATCHDIR='meson64-current'
        ;;

--- a/patch/kernel/meson64-current/0001-Add-Odroid-N2-plus.patch
+++ b/patch/kernel/meson64-current/0001-Add-Odroid-N2-plus.patch
@@ -1,162 +0,0 @@
-From d6b58cbc9e7ba9a4e9ebe63507c9adc0bcd1fb25 Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igor.pecovnik@gmail.com>
-Date: Tue, 4 Aug 2020 23:05:28 +0200
-Subject: [PATCH] Add Odroid N2 plus
-
-Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
- arch/arm64/boot/dts/amlogic/Makefile          |   1 +
- .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 129 ++++++++++++++++++
- 2 files changed, 130 insertions(+)
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-
-diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 37bf75df9..a1534a4ba 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
-+++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
-+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-new file mode 100644
-index 000000000..e5c2c0465
--- /dev/null
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-@@ -0,0 +1,129 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
-+ * Adjusted igor@armbian.com
-+ */
-+
-+/dts-v1/;
-+
-+#include "meson-g12b-odroid-n2.dts"
-+
-+/ {
-+	model = "Hardkernel ODROID-N2Plus";
-+};
-+
-+&vddcpu_a {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_ab 0 1500 0>;
-+};
-+
-+&vddcpu_b {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_AO_cd 1 1500 0>;
-+};
-+
-+&cpu_opp_table_0 {
-+	/delete-node/ opp-100000000;
-+	/delete-node/ opp-250000000;
-+	/delete-node/ opp-500000000;
-+	/delete-node/ opp-667000000;
-+	opp-1000000000 {
-+		opp-hz = /bits/ 64 <1000000000>;
-+		opp-microvolt = <760000>;
-+	};
-+	opp-1200000000 {
-+		opp-hz = /bits/ 64 <1200000000>;
-+		opp-microvolt = <780000>;
-+	};
-+	opp-1398000000 {
-+		opp-hz = /bits/ 64 <1398000000>;
-+		opp-microvolt = <810000>;
-+	};
-+	opp-1512000000 {
-+		opp-hz = /bits/ 64 <1512000000>;
-+		opp-microvolt = <860000>;
-+	};
-+	opp-1608000000 {
-+		opp-hz = /bits/ 64 <1608000000>;
-+		opp-microvolt = <900000>;
-+	};
-+	opp-1704000000 {
-+		opp-hz = /bits/ 64 <1704000000>;
-+		opp-microvolt = <960000>;
-+	};
-+	opp-1800000000 {
-+		opp-hz = /bits/ 64 <1800000000>;
-+		opp-microvolt = <1020000>;
-+	};
-+	opp-1908000000 {
-+		opp-hz = /bits/ 64 <1908000000>;
-+		opp-microvolt = <1030000>;
-+	};
-+	opp-2016000000 {
-+		opp-hz = /bits/ 64 <2016000000>;
-+		opp-microvolt = <1040000>;
-+	};
-+};
-+
-+&cpub_opp_table_1 {
-+	/delete-node/ opp-100000000;
-+	/delete-node/ opp-250000000;
-+	/delete-node/ opp-500000000;
-+	/delete-node/ opp-667000000;
-+	opp-1000000000 {
-+		opp-hz = /bits/ 64 <1000000000>;
-+		opp-microvolt = <730000>;
-+	};
-+	opp-1200000000 {
-+		opp-hz = /bits/ 64 <1200000000>;
-+		opp-microvolt = <750000>;
-+	};
-+	opp-1398000000 {
-+		opp-hz = /bits/ 64 <1398000000>;
-+		opp-microvolt = <770000>;
-+	};
-+	opp-1512000000 {
-+		opp-hz = /bits/ 64 <1512000000>;
-+		opp-microvolt = <770000>;
-+	};
-+	opp-1608000000 {
-+		opp-hz = /bits/ 64 <1608000000>;
-+		opp-microvolt = <780000>;
-+	};
-+	opp-1704000000 {
-+		opp-hz = /bits/ 64 <1704000000>;
-+		opp-microvolt = <790000>;
-+	};
-+	opp-1800000000 {
-+		opp-hz = /bits/ 64 <1800000000>;
-+		opp-microvolt = <830000>;
-+	};
-+	opp-1908000000 {
-+		opp-hz = /bits/ 64 <1908000000>;
-+		opp-microvolt = <860000>;
-+	};
-+	opp-2016000000 {
-+		opp-hz = /bits/ 64 <2016000000>;
-+		opp-microvolt = <910000>;
-+	};
-+	opp-2100000000 {
-+		opp-hz = /bits/ 64 <2100000000>;
-+		opp-microvolt = <960000>;
-+	};
-+	opp-2208000000 {
-+		opp-hz = /bits/ 64 <2208000000>;
-+		opp-microvolt = <1030000>;
-+	};
-+	opp-2304000000 {
-+		opp-hz = /bits/ 64 <2304000000>;
-+		opp-microvolt = <1030000>;
-+	};
-+	opp-2400000000 {
-+		opp-hz = /bits/ 64 <2400000000>;
-+		opp-microvolt = <1040000>;
-+	};
-+};
-- 
-Created with Armbian build tools https://github.com/armbian/build
-
--- a/patch/kernel/meson64-current/board-VIM1-add-simple-MCU-driver-for-FAN.patch
+++ b/patch/kernel/meson64-current/board-VIM1-add-simple-MCU-driver-for-FAN.patch
@@ -142,11 +142,12 @@ diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
 index c1860d35dc7e..9bbf2a479405 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
-@@ -57,3 +57,4 @@ obj-y				+= cardreader/
- obj-$(CONFIG_PVPANIC)   	+= pvpanic.o
+@@ -57,4 +57,5 @@ obj-y				+= cardreader/
 obj-$(CONFIG_HABANA_AI)		+= habanalabs/
+ obj-$(CONFIG_UACCE)		+= uacce/
 obj-$(CONFIG_XILINX_SDFEC)	+= xilinx_sdfec.o
 +obj-$(CONFIG_KHADAS_MCU) += khadas-mcu.o
+ obj-$(CONFIG_HISI_HIKEY_USB)	+= hisi_hikey_usb.o
 diff --git a/drivers/misc/khadas-mcu.c b/drivers/misc/khadas-mcu.c
 new file mode 100644
 index 000000000000..7c6f2903b7a5
--- a/patch/kernel/meson64-current/board-VIM2-add-GPIO-FAN-driver-for-V12-version.patch
+++ b/patch/kernel/meson64-current/board-VIM2-add-GPIO-FAN-driver-for-V12-version.patch
@@ -58,8 +58,8 @@ index 9bbf2a479405..c24a29e12f1f 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
@@ -57,4 +57,5 @@ obj-y				+= cardreader/
- obj-$(CONFIG_PVPANIC)   	+= pvpanic.o
 obj-$(CONFIG_HABANA_AI)		+= habanalabs/
+ obj-$(CONFIG_UACCE)		+= uacce/
 obj-$(CONFIG_XILINX_SDFEC)	+= xilinx_sdfec.o
 +obj-$(CONFIG_KHADAS_FAN) += khadas-fan.o
 obj-$(CONFIG_KHADAS_MCU) += khadas-mcu.o
--- a/patch/kernel/meson64-current/board-nanopi-k2-ethernet-fix.patch
+++ b/patch/kernel/meson64-current/board-nanopi-k2-ethernet-fix.patch
@@ -5,7 +5,7 @@ index a12dc0498..2e7e97966 100644
@@ -226,8 +226,7 @@
 
 			reset-assert-us = <10000>;
- 			reset-deassert-us = <30000>;
+ 			reset-deassert-us = <80000>;
 -			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
 -
 +			max-speed = <1000>;
--- a/patch/kernel/meson64-current/hardkernel-0003-N2-arm64-dts-support-Ulta-High-Speed-MMC-card.patch
+++ b/patch/kernel/meson64-current/hardkernel-0003-N2-arm64-dts-support-Ulta-High-Speed-MMC-card.patch
@@ -9,10 +9,10 @@ Change-Id: I52bbf26aaf807e96bff7665bb65a1ee5594f6449
 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 169ea283d4ee..84236c578075 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -423,7 +423,11 @@ &sd_emmc_b {
 
 	bus-width = <4>;
--- a/patch/kernel/meson64-current/hardkernel-0005-N2-arm64-dts-Add-gpio-line-names.patch
+++ b/patch/kernel/meson64-current/hardkernel-0005-N2-arm64-dts-Add-gpio-line-names.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 05/74] ODROID-N2: arm64/dts: Add gpio-line-names

 Change-Id: Ie5b40ea8885c324c81b4fa80a5bbe59b533b1b3a
 ---
- .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 45 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index e9d8d6bf4100..0bbd97997a42 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -412,6 +412,51 @@ &frddr_c {
 };
 
--- a/patch/kernel/meson64-current/hardkernel-0006-N2-ARM64-dts-add-uart_A-node.patch
+++ b/patch/kernel/meson64-current/hardkernel-0006-N2-ARM64-dts-add-uart_A-node.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 06/74] ODROID-N2: ARM64/dts: add uart_A node

 Change-Id: I129c3d059231a7941285deffc293ee72784adcce
 ---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 9 ++++++++-
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 0bbd97997a42..9e29fdbf149d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -16,8 +16,9 @@ / {
 	model = "Hardkernel ODROID-N2";
 
--- a/patch/kernel/meson64-current/hardkernel-0007-N2-ARM64-dts-add-i2c2-i2c3-node.patch
+++ b/patch/kernel/meson64-current/hardkernel-0007-N2-ARM64-dts-add-i2c2-i2c3-node.patch
@@ -8,19 +8,19 @@ Change-Id: I00e3748a6f8474a99d05200afc60b8d794f75c96
 .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 9e29fdbf149d..758528f988dd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -17,6 +17,8 @@ / {
- 
 	aliases {
 		ethernet0 = &ethmac;
-+		i2c1 = &i2c2;
-+		i2c2 = &i2c3;
 		serial0 = &uart_AO;
 		serial1 = &uart_A;
+		i2c0 = &i2c2;
+		i2c1 = &i2c3;
 	};
+ 
@@ -485,6 +487,35 @@ hdmi_tx_tmds_out: endpoint {
 	};
 };
--- a/patch/kernel/meson64-current/hardkernel-0008-N2-ARM64-dts-add-saradc-node.patch
+++ b/patch/kernel/meson64-current/hardkernel-0008-N2-ARM64-dts-add-saradc-node.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 08/74] ODROID-N2: ARM64/dts: add saradc node

 Change-Id: Ieced434cbde791edee600832f51bd5021b4604aa
 ---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 4 ++++
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 758528f988dd..63b23c84e022 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -561,6 +561,10 @@ &pwm_AO_cd {
 	status = "okay";
 };
--- a/patch/kernel/meson64-current/hardkernel-0009-N2-arm64-dts-modify-i2c-alias-bus-number.patch
+++ b/patch/kernel/meson64-current/hardkernel-0009-N2-arm64-dts-modify-i2c-alias-bus-number.patch
@@ -1,37 +0,0 @@
-From fc7ffa81905a6efeb8a900dddc9ec468b5d382ca Mon Sep 17 00:00:00 2001
-From: Hyeonki Hong <hhk7734@gmail.com>
-Date: Tue, 21 Apr 2020 16:22:24 +0900
-Subject: [PATCH 09/74] ODROID-N2: arm64/dts: modify i2c alias bus number
-
-Change-Id: I49b58c681dea5377df0ee7ab98163165d5521cb8
---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-index 63b23c84e022..90d9d38fe57a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-@@ -17,8 +17,8 @@ / {
- 
- 	aliases {
- 		ethernet0 = &ethmac;
-		i2c1 = &i2c2;
-		i2c2 = &i2c3;
-+		i2c0 = &i2c2;
-+		i2c1 = &i2c3;
- 		serial0 = &uart_AO;
- 		serial1 = &uart_A;
- 	};
-@@ -379,7 +379,7 @@ cpufreq_map1 {
- 
- &ext_mdio {
- 	external_phy: ethernet-phy@0 {
-		/* Realtek RTL8211F (0x001cc916) */	
-+		/* Realtek RTL8211F (0x001cc916) */
- 		reg = <0>;
- 		max-speed = <1000>;
- 
-- 
-2.25.1
-
--- a/patch/kernel/meson64-current/hardkernel-0010-N2-arm64-dts-modify-i2c-alias-bus-number.patch
+++ b/patch/kernel/meson64-current/hardkernel-0010-N2-arm64-dts-modify-i2c-alias-bus-number.patch
@@ -1,28 +0,0 @@
-From 3df99e8732d51402c0540d58d0a3be67e6576fb3 Mon Sep 17 00:00:00 2001
-From: Hyeonki Hong <hhk7734@gmail.com>
-Date: Tue, 21 Apr 2020 16:22:24 +0900
-Subject: [PATCH 10/74] ODROID-N2: arm64/dts: modify i2c alias bus number
-
-Change-Id: I49b58c681dea5377df0ee7ab98163165d5521cb8
---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-index 90d9d38fe57a..c1b905260d34 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-@@ -17,8 +17,8 @@ / {
- 
- 	aliases {
- 		ethernet0 = &ethmac;
-		i2c0 = &i2c2;
-		i2c1 = &i2c3;
-+		i2c1 = &i2c2;
-+		i2c2 = &i2c3;
- 		serial0 = &uart_AO;
- 		serial1 = &uart_A;
- 	};
-- 
-2.25.1
-
--- a/patch/kernel/meson64-current/hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch
+++ b/patch/kernel/meson64-current/hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch
@@ -68,9 +68,9 @@ index 30d1e1b42492..4585f02ad833 100644
 --- a/drivers/input/touchscreen/Makefile
 +++ b/drivers/input/touchscreen/Makefile
@@ -111,3 +111,4 @@ obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o
- obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o
 obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
 obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o
+ obj-$(CONFIG_TOUCHSCREEN_ZINITIX)	+= zinitix.o
 +obj-$(CONFIG_TOUCHSCREEN_DWAV_USB_MT)	+= dwav-usb-mt.o
 diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c
 new file mode 100644
--- a/patch/kernel/meson64-current/hardkernel-0020-N2-C4-arm64-dts-add-CPU-thermal-cooling-map.patch
+++ b/patch/kernel/meson64-current/hardkernel-0020-N2-C4-arm64-dts-add-CPU-thermal-cooling-map.patch
@@ -10,10 +10,10 @@ Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 .../boot/dts/amlogic/meson-sm1-odroid-c4.dts  | 23 ++++++++++++++
 2 files changed, 53 insertions(+)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 047e076df661..232f86c6c37d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -292,6 +292,7 @@ &cpu0 {
 	operating-points-v2 = <&cpu_opp_table_0>;
 	clocks = <&clkc CLKID_CPU_CLK>;
--- a/patch/kernel/meson64-current/hardkernel-0023-N2-arm64-dts-modify-i2c-alias-bus-number.patch
+++ b/patch/kernel/meson64-current/hardkernel-0023-N2-arm64-dts-modify-i2c-alias-bus-number.patch
@@ -1,28 +0,0 @@
-From b34c9fad04b326725dd5b2723e1868580564741b Mon Sep 17 00:00:00 2001
-From: Hyeonki Hong <hhk7734@gmail.com>
-Date: Fri, 12 Jun 2020 16:42:39 +0900
-Subject: [PATCH 23/74] ODROID-N2: arm64/dts: modify i2c alias bus number
-
-Change-Id: Ie9550c77f01931e6c718b869d6581cadd44d45f8
---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-index 232f86c6c37d..65df5fb49ae6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-@@ -17,8 +17,8 @@ / {
- 
- 	aliases {
- 		ethernet0 = &ethmac;
-		i2c1 = &i2c2;
-		i2c2 = &i2c3;
-+		i2c0 = &i2c2;
-+		i2c1 = &i2c3;
- 		serial0 = &uart_AO;
- 		serial1 = &uart_A;
- 	};
-- 
-2.25.1
-
--- a/patch/kernel/meson64-current/hardkernel-igor-0091-Add-fan-support-to-Odroid-N2-plus.patch
+++ b/patch/kernel/meson64-current/hardkernel-igor-0091-Add-fan-support-to-Odroid-N2-plus.patch
@@ -8,10 +8,10 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 index 65df5fb49..50bfb0dce 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2019 BayLibre, SAS
--- a/patch/kernel/meson64-current/need_check/0075-ODROID-N2-arm64-dts-reboot-power-off-support-for-ODR.patch
+++ b/patch/kernel/meson64-current/need_check/0075-ODROID-N2-arm64-dts-reboot-power-off-support-for-ODR.patch
--- a/patch/kernel/meson64-current/need_check/0084-WIP-arm64-dts-meson-g12b-khadas-vim3-add-the-Etherne.patch
+++ b/patch/kernel/meson64-current/need_check/0084-WIP-arm64-dts-meson-g12b-khadas-vim3-add-the-Etherne.patch
--- a/patch/kernel/meson64-current/need_check/0091-GX-update-TEXT_OFFSET-for-Amlogic-MESON-SoC.patch
+++ b/patch/kernel/meson64-current/need_check/0091-GX-update-TEXT_OFFSET-for-Amlogic-MESON-SoC.patch
--- a/patch/kernel/meson64-current/need_check/board-odroidn2-eth0-disable-reset.patch
+++ b/patch/kernel/meson64-current/need_check/board-odroidn2-eth0-disable-reset.patch
--- a/patch/kernel/meson64-current/need_check/linux-5.5-net-smsc95xx-allow-mac-address-as-param.patch
+++ b/patch/kernel/meson64-current/need_check/linux-5.5-net-smsc95xx-allow-mac-address-as-param.patch
--- a/patch/kernel/meson64-current/odroid-n2-rtc0.patch
+++ b/patch/kernel/meson64-current/odroid-n2-rtc0.patch
@@ -1,11 +1,11 @@
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
 index 93ba39044eb3..e2f727ffb731 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -24,6 +24,7 @@ aliases {
- 		i2c1 = &i2c3;
- 		serial0 = &uart_AO;
 		serial1 = &uart_A;
+ 		i2c0 = &i2c2;
+ 		i2c1 = &i2c3;
 +		rtc1 = &vrtc;
 	};