From 3f4da8a0203f63f023716cb033d75db263fbd238 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Tue, 15 Aug 2023 13:54:02 +0200
Subject: [PATCH] `odroidm1`/`edge` (`rk3568-odroid`): bump to 6.4.y, update
 config, rebase patches to 6.4.10

---
 config/kernel/linux-rk3568-odroid-edge.config | 185 +++++----
 config/sources/families/rk3568-odroid.conf    |   6 +-
 .../board-odroidm1-spi-uart-pwm.patch         |  60 +++
 .../drv-spi-spidev-remove-warnings.patch      |  38 ++
 ...eral-add-overlay-compilation-support.patch | 102 +++++
 .../overlays-00-add-odroid-buses.patch        | 355 ++++++++++++++++++
 6 files changed, 667 insertions(+), 79 deletions(-)
 create mode 100644 patch/kernel/archive/rk3568-odroid-6.4/board-odroidm1-spi-uart-pwm.patch
 create mode 100644 patch/kernel/archive/rk3568-odroid-6.4/drv-spi-spidev-remove-warnings.patch
 create mode 100644 patch/kernel/archive/rk3568-odroid-6.4/general-add-overlay-compilation-support.patch
 create mode 100644 patch/kernel/archive/rk3568-odroid-6.4/overlays-00-add-odroid-buses.patch

diff --git a/config/kernel/linux-rk3568-odroid-edge.config b/config/kernel/linux-rk3568-odroid-edge.config
index 8318805d19..26d530712b 100644
--- a/config/kernel/linux-rk3568-odroid-edge.config
+++ b/config/kernel/linux-rk3568-odroid-edge.config
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.3.5 Kernel Configuration
+# Linux/arm64 6.4.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110300
 CONFIG_CLANG_VERSION=0
@@ -138,7 +138,6 @@ CONFIG_CPU_ISOLATION=y
 CONFIG_TREE_RCU=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
@@ -152,7 +151,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 # CONFIG_PRINTK_INDEX is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 
@@ -202,7 +200,6 @@ CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -296,6 +293,7 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 
 #
 # Platform selection
@@ -343,6 +341,7 @@ CONFIG_ARCH_ROCKCHIP=y
 #
 # ARM errata workarounds via the alternatives framework
 #
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_ERRATUM_826319=y
 CONFIG_ARM64_ERRATUM_827319=y
@@ -387,6 +386,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
+CONFIG_ROCKCHIP_ERRATUM_3588001=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
@@ -422,7 +422,7 @@ CONFIG_KEXEC_FILE=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
-CONFIG_ARCH_FORCE_MAX_ORDER=11
+CONFIG_ARCH_FORCE_MAX_ORDER=10
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
@@ -703,6 +703,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -783,6 +784,7 @@ CONFIG_FUNCTION_ALIGNMENT=4
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -801,6 +803,7 @@ CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -923,7 +926,6 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8
 #
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB_DEPRECATED is not set
 # CONFIG_SLUB_TINY is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
@@ -991,12 +993,16 @@ CONFIG_ARCH_USES_PG_ARCH_X=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
 # CONFIG_LRU_GEN is not set
+CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
+CONFIG_LOCK_MM_AND_FIND_VMA=y
 
 #
 # Data Access Monitoring
@@ -1045,6 +1051,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XDP_SOCKETS_DIAG is not set
+CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1155,6 +1162,7 @@ CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -1735,6 +1743,7 @@ CONFIG_NET_L3_MASTER_DEV=y
 # CONFIG_QRTR is not set
 # CONFIG_NET_NCSI is not set
 CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
@@ -1842,6 +1851,7 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
 CONFIG_BT_VIRTIO=m
+# CONFIG_BT_NXPUART is not set
 # end of Bluetooth device drivers
 
 CONFIG_AF_RXRPC=m
@@ -1960,7 +1970,7 @@ CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
+CONFIG_PAGE_POOL_STATS=y
 CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -2015,49 +2025,49 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 #
 # PCI controller drivers
 #
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_XILINX is not set
-CONFIG_PCI_XGENE=y
-CONFIG_PCI_XGENE_MSI=y
 # CONFIG_PCIE_ALTERA is not set
 # CONFIG_PCI_HOST_THUNDER_PEM is not set
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=y
 CONFIG_PCIE_ROCKCHIP_EP=y
-# CONFIG_PCIE_MICROCHIP_HOST is not set
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+# CONFIG_PCIE_XILINX is not set
 
 #
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-CONFIG_PCIE_DW_EP=y
-CONFIG_PCIE_DW_PLAT=y
-CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCIE_DW_PLAT_EP=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_ROCKCHIP_DW_HOST=y
-# CONFIG_PCIE_KIRIN is not set
-# CONFIG_PCI_MESON is not set
-# CONFIG_PCIE_AL is not set
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
+# Cadence-based PCIe controllers
 #
 # CONFIG_PCIE_CADENCE_PLAT_HOST is not set
 # CONFIG_PCIE_CADENCE_PLAT_EP is not set
 # CONFIG_PCI_J721E_HOST is not set
 # CONFIG_PCI_J721E_EP is not set
-# end of Cadence PCIe controllers support
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_EP=y
+# CONFIG_PCIE_AL is not set
+# CONFIG_PCI_MESON is not set
+CONFIG_PCI_HISI=y
+# CONFIG_PCIE_KIRIN is not set
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_DW_PLAT_EP=y
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2103,6 +2113,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2135,6 +2146,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
 # end of Generic Driver Options
 
 #
@@ -2437,6 +2449,7 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_UBLK=m
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 
 #
 # NVME Support
@@ -2669,8 +2682,6 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_DWC=m
 # CONFIG_AHCI_CEVA is not set
-CONFIG_AHCI_XGENE=y
-# CONFIG_AHCI_QORIQ is not set
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=y
@@ -2816,6 +2827,7 @@ CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
+# CONFIG_REMOTE_TARGET is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -2913,6 +2925,8 @@ CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MT7530_MDIO=m
+CONFIG_NET_DSA_MT7530_MMIO=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
@@ -2925,6 +2939,7 @@ CONFIG_NET_DSA_MV88E6XXX=m
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT is not set
 CONFIG_NET_DSA_SJA1105=m
 # CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_XRS700X=m
@@ -2961,6 +2976,7 @@ CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_AMD_XGBE=m
 # CONFIG_AMD_XGBE_DCB is not set
+# CONFIG_PDS_CORE is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
@@ -3054,7 +3070,6 @@ CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
 CONFIG_IGBVF=m
-CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCB=y
@@ -3068,10 +3083,6 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
 # CONFIG_IGC is not set
-CONFIG_NET_VENDOR_WANGXUN=y
-CONFIG_LIBWX=m
-# CONFIG_NGBE is not set
-CONFIG_TXGBE=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_ADI=y
 CONFIG_ADIN1110=m
@@ -3210,6 +3221,10 @@ CONFIG_NET_VENDOR_VERTEXCOM=y
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+# CONFIG_NGBE is not set
+CONFIG_TXGBE=m
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
@@ -3224,6 +3239,7 @@ CONFIG_PHYLINK=y
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 CONFIG_LED_TRIGGER_PHY=y
+CONFIG_PHYLIB_LEDS=y
 CONFIG_FIXED_PHY=y
 CONFIG_SFP=m
 
@@ -3255,11 +3271,13 @@ CONFIG_MARVELL_88X2222_PHY=m
 CONFIG_MAXLINEAR_GPHY=m
 CONFIG_MEDIATEK_GE_PHY=m
 CONFIG_MICREL_PHY=y
+# CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROSEMI_PHY is not set
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_CBTX_PHY is not set
 CONFIG_NXP_C45_TJA11XX_PHY=m
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_NCN26000_PHY is not set
@@ -3373,6 +3391,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=y
 # PCS device drivers
 #
 CONFIG_PCS_XPCS=y
+CONFIG_PCS_MTK_LYNXI=m
 CONFIG_PCS_ALTERA_TSE=m
 # end of PCS device drivers
 
@@ -3544,6 +3563,7 @@ CONFIG_BRCMFMAC_PCIE=y
 CONFIG_BRCM_TRACING=y
 CONFIG_BRCMDBG=y
 CONFIG_WLAN_VENDOR_CISCO=y
+# CONFIG_AIRO is not set
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3707,12 +3727,16 @@ CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
+# CONFIG_RTW88_8822BS is not set
 # CONFIG_RTW88_8822BU is not set
 CONFIG_RTW88_8822CE=m
+# CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
 CONFIG_RTW88_8723DE=m
+# CONFIG_RTW88_8723DS is not set
 # CONFIG_RTW88_8723DU is not set
 CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_8821CS is not set
 # CONFIG_RTW88_8821CU is not set
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
@@ -3762,8 +3786,8 @@ CONFIG_ZD1211RW=m
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
-CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
 CONFIG_VIRT_WIFI=m
 CONFIG_WAN=y
 CONFIG_HDLC=m
@@ -3986,6 +4010,7 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set
 # CONFIG_TOUCHSCREEN_IMAGIS is not set
 CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
 CONFIG_TOUCHSCREEN_INEXIO=m
@@ -4405,7 +4430,6 @@ CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_HISI_KUNPENG=m
 CONFIG_SPI_HISI_SFC_V3XX=m
-CONFIG_SPI_NXP_FLEXSPI=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_FSL_LIB=m
@@ -4505,6 +4529,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
+CONFIG_OF_GPIO_MM_GPIOCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
@@ -4542,6 +4567,7 @@ CONFIG_GPIO_AMD_FCH=m
 # I2C GPIO expanders
 #
 CONFIG_GPIO_ADNP=m
+# CONFIG_GPIO_FXL6408 is not set
 CONFIG_GPIO_GW_PLD=m
 CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
@@ -4832,6 +4858,7 @@ CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
+# CONFIG_SENSORS_ACBEL_FSG032 is not set
 # CONFIG_SENSORS_ADM1266 is not set
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_BEL_PFE=m
@@ -5055,6 +5082,7 @@ CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MADERA is not set
+# CONFIG_MFD_MAX597X is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -5243,10 +5271,12 @@ CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_ROHM=m
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT4803 is not set
 CONFIG_REGULATOR_RT4831=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_RT5120=m
 # CONFIG_REGULATOR_RT5190A is not set
+# CONFIG_REGULATOR_RT5739 is not set
 CONFIG_REGULATOR_RT5759=m
 CONFIG_REGULATOR_RT6160=m
 # CONFIG_REGULATOR_RT6190 is not set
@@ -5368,7 +5398,6 @@ CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
 # end of Video4Linux options
 
 #
@@ -5806,15 +5835,12 @@ CONFIG_VIDEO_AR0521=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 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=m
 # 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
@@ -5854,13 +5880,9 @@ CONFIG_VIDEO_OV9734=m
 # CONFIG_VIDEO_S5C73M3 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_ST_VGXY61 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
 
 #
@@ -5949,7 +5971,6 @@ CONFIG_VIDEO_CX25840=m
 #
 # Video encoders
 #
-CONFIG_VIDEO_AD9389B=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7343=m
@@ -6214,6 +6235,7 @@ CONFIG_DVB_DUMMY_FE=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
 CONFIG_VIDEO_NOMODESET=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DBI=m
@@ -6278,6 +6300,7 @@ CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
 CONFIG_DRM_PANEL=y
 
 #
@@ -6314,12 +6337,14 @@ CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 CONFIG_DRM_PANEL_LG_LB035Q02=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 CONFIG_DRM_PANEL_NEWVISION_NV3052C=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
 CONFIG_DRM_PANEL_NOVATEK_NT39016=m
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
@@ -6351,6 +6376,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 CONFIG_DRM_PANEL_TDO_TL070WSH30=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
@@ -6385,6 +6411,7 @@ CONFIG_DRM_LVDS_CODEC=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_PARADE_PS8640=m
+# CONFIG_DRM_SAMSUNG_DSIM is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
@@ -6450,7 +6477,6 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -6872,6 +6898,8 @@ CONFIG_SND_SOC_CS35L41_I2C=m
 CONFIG_SND_SOC_CS35L45=m
 CONFIG_SND_SOC_CS35L45_SPI=m
 CONFIG_SND_SOC_CS35L45_I2C=m
+# CONFIG_SND_SOC_CS35L56_I2C is not set
+# CONFIG_SND_SOC_CS35L56_SPI is not set
 CONFIG_SND_SOC_CS42L42_CORE=m
 CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42L51=m
@@ -7264,7 +7292,6 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_U132_HCD is not set
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_R8A66597_HCD=m
@@ -7384,7 +7411,6 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y
 #
 # USB port drivers
 #
-CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
@@ -7445,6 +7471,7 @@ CONFIG_USB_SERIAL_DEBUG=m
 #
 # USB Miscellaneous drivers
 #
+CONFIG_USB_USS720=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
@@ -7454,7 +7481,6 @@ CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
@@ -7728,6 +7754,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
+# CONFIG_LEDS_BD2606MVV is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 CONFIG_LEDS_ADP5520=m
@@ -7756,6 +7783,7 @@ CONFIG_LEDS_LM3697=m
 # CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_MT6370_FLASH is not set
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
@@ -7776,7 +7804,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=y
-CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
@@ -8032,6 +8059,7 @@ CONFIG_VP_VDPA=m
 # CONFIG_SNET_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
 CONFIG_VHOST=m
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
@@ -8098,12 +8126,6 @@ CONFIG_AD9834=m
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
 
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
 #
 # Resolver to digital converters
 #
@@ -8222,6 +8244,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_RS9_PCIE is not set
+# CONFIG_COMMON_CLK_SI521XX is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 CONFIG_COMMON_CLK_VC7=m
 CONFIG_COMMON_CLK_BD718XX=m
@@ -8264,7 +8287,6 @@ CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_IOVA=y
-CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -8557,6 +8579,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7924 is not set
+# CONFIG_TI_ADS1100 is not set
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
@@ -8836,6 +8859,7 @@ CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
+# CONFIG_ROHM_BU27034 is not set
 CONFIG_RPR0521=m
 CONFIG_SENSORS_LM3533=m
 CONFIG_LTR501=m
@@ -9061,7 +9085,6 @@ CONFIG_RESET_TI_TPS380X=m
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_XGENE=y
 CONFIG_PHY_CAN_TRANSCEIVER=m
 
 #
@@ -9113,6 +9136,7 @@ CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 # CONFIG_ARM_SMMU_V3_PMU is not set
+CONFIG_ARM_PMUV3=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
 CONFIG_ARM_DMC620_PMU=y
@@ -9138,6 +9162,14 @@ CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_CXL=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
 CONFIG_NVMEM_RAVE_SP_EEPROM=m
 CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -9171,6 +9203,7 @@ CONFIG_FPGA_MGR_MICROCHIP_SPI=m
 # CONFIG_FSI is not set
 CONFIG_TEE=y
 CONFIG_OPTEE=m
+# CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set
 CONFIG_MULTIPLEXER=y
 
 #
@@ -9194,6 +9227,7 @@ CONFIG_MOST=m
 CONFIG_MOST_SND=m
 # CONFIG_PECI is not set
 # CONFIG_HTE is not set
+# CONFIG_CDX_BUS is not set
 # end of Device Drivers
 
 #
@@ -9230,6 +9264,7 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
@@ -9283,7 +9318,6 @@ CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
@@ -9535,7 +9569,7 @@ CONFIG_CIFS_FSCACHE=y
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -9597,7 +9631,6 @@ CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
-# CONFIG_DLM_DEPRECATED_API is not set
 # CONFIG_DLM_DEBUG is not set
 CONFIG_UNICODE=y
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
@@ -9629,10 +9662,8 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 CONFIG_SECURITY_SMACK=y
@@ -9919,6 +9950,8 @@ CONFIG_CRYPTO_DEV_ATMEL_I2C=m
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 # CONFIG_CRYPTO_DEV_CCP is not set
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QAT=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_C3XXX=m
@@ -9927,8 +9960,6 @@ CONFIG_CRYPTO_DEV_QAT_4XXX=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_NITROX=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG is not set
@@ -10075,6 +10106,7 @@ CONFIG_INTERVAL_TREE=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_DMA_OPS=y
@@ -10243,6 +10275,7 @@ CONFIG_GENERIC_PTDUMP=y
 # CONFIG_PTDUMP_DEBUGFS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/config/sources/families/rk3568-odroid.conf b/config/sources/families/rk3568-odroid.conf
index 78f0a7e37c..ee22d94821 100644
--- a/config/sources/families/rk3568-odroid.conf
+++ b/config/sources/families/rk3568-odroid.conf
@@ -22,9 +22,9 @@ SKIP_BOOTSPLASH="yes"
 case $BRANCH in
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.3" # Major and minor versions of this kernel (for armbian-next)
-		KERNELBRANCH='branch:linux-6.3.y'
-		KERNELPATCHDIR='archive/rk3568-odroid-6.3' # patches for overlays et al
+		declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel (for armbian-next)
+		KERNELBRANCH='branch:linux-6.4.y'
+		KERNELPATCHDIR='archive/rk3568-odroid-6.4' # patches for overlays et al
 		;;
 
 esac
diff --git a/patch/kernel/archive/rk3568-odroid-6.4/board-odroidm1-spi-uart-pwm.patch b/patch/kernel/archive/rk3568-odroid-6.4/board-odroidm1-spi-uart-pwm.patch
new file mode 100644
index 0000000000..baa53ed2de
--- /dev/null
+++ b/patch/kernel/archive/rk3568-odroid-6.4/board-odroidm1-spi-uart-pwm.patch
@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joao Assuncao <joao@joaoassuncao.com>
+Date: Sun, 12 Feb 2023 21:20:35 +0100
+Subject: [ARCHEOLOGY] Adds SPI, I2C, and PWM DTS overlays for odroid-m1
+ (#4825)
+
+> X-Git-Archeology: > recovered message: > Adds i2c3, pwm1, pwdm2, spi0 and uart1 nodes to rk3568-odroid-m1.dts.
+> X-Git-Archeology: > recovered message: > Adds patch to remove spi-dev warning
+> X-Git-Archeology: > recovered message: > Adds patch with support for overlay compilation
+> X-Git-Archeology: > recovered message: > Adds DTS overlays for spi, uart0, uart1, pwm1, pwm2, pwm9, i2c0 and i2c1
+> X-Git-Archeology: > recovered message: > Co-authored-by: jassuncao <joao.assuncao@exploitsys.com>
+---
+ arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 34 ++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+index 59ecf868dbd0..a0d227fdd86d 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+@@ -742,3 +742,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ 		remote-endpoint = <&hdmi_in_vp0>;
+ 	};
+ };
++
++&i2c3 {
++	status = "disabled";
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c3m1_xfer>;
++};
++
++&pwm1 {
++	status = "disabled";
++	pinctrl-0 = <&pwm1m1_pins>;
++};
++
++&pwm2 {
++	status = "disabled";
++	pinctrl-0 = <&pwm2m1_pins>;
++};
++
++&spi0 {
++	status = "disabled";
++
++	pinctrl-0 = <&spi0m1_pins>;
++	pinctrl-1 = <&spi0m1_pins_hs>;
++	num_chipselect = <1>;
++
++	cs-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_LOW>;
++};
++
++&uart1 {
++	status = "disabled";
++	dma-names = "tx", "rx";
++	/* uart1 uart1-with-ctsrts */
++	pinctrl-0 = <&uart1m1_xfer>;
++	pinctrl-1 = <&uart1m1_xfer &uart1m1_ctsn &uart1m1_rtsn>;
++};
+-- 
+Armbian
+
diff --git a/patch/kernel/archive/rk3568-odroid-6.4/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rk3568-odroid-6.4/drv-spi-spidev-remove-warnings.patch
new file mode 100644
index 0000000000..25f6861193
--- /dev/null
+++ b/patch/kernel/archive/rk3568-odroid-6.4/drv-spi-spidev-remove-warnings.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
+Date: Sat, 4 Mar 2017 00:12:55 +0300
+Subject: [ARCHEOLOGY] Adds SPI, I2C, and PWM DTS overlays for odroid-m1
+ (#4825)
+
+> X-Git-Archeology: > recovered message: > Adds i2c3, pwm1, pwdm2, spi0 and uart1 nodes to rk3568-odroid-m1.dts.
+> X-Git-Archeology: > recovered message: > Adds patch to remove spi-dev warning
+> X-Git-Archeology: > recovered message: > Adds patch with support for overlay compilation
+> X-Git-Archeology: > recovered message: > Adds DTS overlays for spi, uart0, uart1, pwm1, pwm2, pwm9, i2c0 and i2c1
+> X-Git-Archeology: > recovered message: > Co-authored-by: jassuncao <joao.assuncao@exploitsys.com>
+---
+ drivers/spi/spidev.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
+index 39d94c850839..5ae87eb7190b 100644
+--- a/drivers/spi/spidev.c
++++ b/drivers/spi/spidev.c
+@@ -703,6 +703,7 @@ static const struct file_operations spidev_fops = {
+ static struct class *spidev_class;
+ 
+ static const struct spi_device_id spidev_spi_ids[] = {
++	{ .name = "spi-dev" },
+ 	{ .name = "dh2228fv" },
+ 	{ .name = "ltc2488" },
+ 	{ .name = "sx1301" },
+@@ -731,6 +732,7 @@ static int spidev_of_check(struct device *dev)
+ }
+ 
+ static const struct of_device_id spidev_dt_ids[] = {
++	{ .compatible = "armbian,spi-dev", .data = &spidev_of_check },
+ 	{ .compatible = "cisco,spi-petra", .data = &spidev_of_check },
+ 	{ .compatible = "dh,dhcom-board", .data = &spidev_of_check },
+ 	{ .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check },
+-- 
+Armbian
+
diff --git a/patch/kernel/archive/rk3568-odroid-6.4/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rk3568-odroid-6.4/general-add-overlay-compilation-support.patch
new file mode 100644
index 0000000000..01e6f88181
--- /dev/null
+++ b/patch/kernel/archive/rk3568-odroid-6.4/general-add-overlay-compilation-support.patch
@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
+Date: Sat, 11 Feb 2017 20:32:53 +0300
+Subject: [ARCHEOLOGY] Adds SPI, I2C, and PWM DTS overlays for odroid-m1
+ (#4825)
+
+> X-Git-Archeology: > recovered message: > Adds i2c3, pwm1, pwdm2, spi0 and uart1 nodes to rk3568-odroid-m1.dts.
+> X-Git-Archeology: > recovered message: > Adds patch to remove spi-dev warning
+> X-Git-Archeology: > recovered message: > Adds patch with support for overlay compilation
+> X-Git-Archeology: > recovered message: > Adds DTS overlays for spi, uart0, uart1, pwm1, pwm2, pwm9, i2c0 and i2c1
+> X-Git-Archeology: > recovered message: > Co-authored-by: jassuncao <joao.assuncao@exploitsys.com>
+---
+ arch/arm/boot/.gitignore |  2 +
+ scripts/Makefile.dtbinst | 14 ++++++-
+ scripts/Makefile.lib     | 20 ++++++++++
+ 3 files changed, 35 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
+index 8c759326baf4..e6ce8f6ad4b1 100644
+--- a/arch/arm/boot/.gitignore
++++ b/arch/arm/boot/.gitignore
+@@ -4,3 +4,5 @@ zImage
+ xipImage
+ bootpImage
+ uImage
++*.dtb*
++*.scr
+diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
+index 2ab936e4179d..39a199e5e9b4 100644
+--- a/scripts/Makefile.dtbinst
++++ b/scripts/Makefile.dtbinst
+@@ -18,9 +18,12 @@ include $(srctree)/scripts/Kbuild.include
+ include $(kbuild-file)
+ 
+ dtbs    := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
++dtbos   := $(addprefix $(dst)/, $(dtbo-y))
++scrs    := $(addprefix $(dst)/, $(scr-y))
++readmes := $(addprefix $(dst)/, $(dtbotxt-y))
+ subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
+ 
+-__dtbs_install: $(dtbs) $(subdirs)
++__dtbs_install: $(dtbs) $(dtbos) $(scrs) $(readmes) $(subdirs)
+ 	@:
+ 
+ quiet_cmd_dtb_install = INSTALL $@
+@@ -32,6 +35,15 @@ $(dst)/%.dtb: $(obj)/%.dtb
+ $(dst)/%.dtbo: $(obj)/%.dtbo
+ 	$(call cmd,dtb_install)
+ 
++$(dst)/%.dtbo: $(obj)/%.dtbo
++	$(call cmd,dtb_install)
++
++$(dst)/%.scr: $(obj)/%.scr
++	$(call cmd,dtb_install)
++
++$(dst)/README.rockchip-overlays: $(src)/README.rockchip-overlays
++	$(call cmd,dtb_install)
++
+ PHONY += $(subdirs)
+ $(subdirs):
+ 	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 100a386fcd71..1680499136ee 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -343,6 +343,9 @@ DTC ?= $(objtree)/scripts/dtc/dtc
+ DTC_FLAGS += -Wno-interrupt_provider \
+ 	-Wno-unique_unit_address
+ 
++# Overlay support
++DTC_FLAGS += -@ -Wno-unit_address_format -Wno-simple_bus_reg
++
+ # Disable noisy checks by default
+ ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
+ DTC_FLAGS += -Wno-unit_address_vs_reg \
+@@ -424,6 +427,23 @@ $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ 	$(call if_changed_dep,dtc)
+ 
++quiet_cmd_dtco = DTCO    $@
++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
++	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
++	$(DTC) -O dtb -o $@ -b 0 \
++		-i $(dir $<) $(DTC_FLAGS) \
++		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
++	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
++
++$(obj)/%.dtbo: $(src)/%.dts FORCE
++	$(call if_changed_dep,dtco)
++
++quiet_cmd_scr = MKIMAGE $@
++cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
++
++$(obj)/%.scr: $(src)/%.scr-cmd FORCE
++	$(call if_changed,scr)
++
+ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+ 
+ # Bzip2
+-- 
+Armbian
+
diff --git a/patch/kernel/archive/rk3568-odroid-6.4/overlays-00-add-odroid-buses.patch b/patch/kernel/archive/rk3568-odroid-6.4/overlays-00-add-odroid-buses.patch
new file mode 100644
index 0000000000..41c5fad4e8
--- /dev/null
+++ b/patch/kernel/archive/rk3568-odroid-6.4/overlays-00-add-odroid-buses.patch
@@ -0,0 +1,355 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joao Assuncao <joao@joaoassuncao.com>
+Date: Sun, 12 Feb 2023 21:20:35 +0100
+Subject: [ARCHEOLOGY] Adds SPI, I2C, and PWM DTS overlays for odroid-m1
+ (#4825)
+
+> X-Git-Archeology: > recovered message: > Adds i2c3, pwm1, pwdm2, spi0 and uart1 nodes to rk3568-odroid-m1.dts.
+> X-Git-Archeology: > recovered message: > Adds patch to remove spi-dev warning
+> X-Git-Archeology: > recovered message: > Adds patch with support for overlay compilation
+> X-Git-Archeology: > recovered message: > Adds DTS overlays for spi, uart0, uart1, pwm1, pwm2, pwm9, i2c0 and i2c1
+> X-Git-Archeology: > recovered message: > Co-authored-by: jassuncao <joao.assuncao@exploitsys.com>
+---
+ arch/arm64/boot/dts/rockchip/Makefile                           |  2 +
+ arch/arm64/boot/dts/rockchip/overlay/Makefile                   | 23 ++++
+ arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays   | 69 ++++++++++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd     |  7 +
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c0.dts          | 14 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c1.dts          | 12 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm1.dts          | 13 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm2.dts          | 13 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm9.dts          | 13 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts    | 22 +++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0-rts_cts.dts | 14 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts         | 13 ++
+ arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts         | 15 ++
+ scripts/Makefile.lib                                            |  3 +
+ 14 files changed, 233 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
+index 2d585bbb8f3a..91bf8ce95d7d 100644
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -96,3 +96,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
++
++subdir-y       := $(dts-dirs) overlay
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
+new file mode 100644
+index 000000000000..9c5a73e002f2
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
+@@ -0,0 +1,23 @@
++# SPDX-License-Identifier: GPL-2.0
++dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
++	rockchip-spi-spidev.dtbo \
++	rockchip-uart0.dtbo \
++	rockchip-uart0-rts_cts.dtbo \
++	rockchip-uart1.dtbo \
++	rockchip-pwm1.dtbo \
++	rockchip-pwm2.dtbo \
++	rockchip-pwm9.dtbo \
++	rockchip-i2c0.dtbo \
++	rockchip-i2c1.dtbo
++
++scr-$(CONFIG_ARCH_ROCKCHIP) += \
++       rockchip-fixup.scr
++
++dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \
++       README.rockchip-overlays
++
++targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
++
++always         := $(dtbo-y) $(scr-y) $(dtbotxt-y)
++clean-files    := *.dtbo *.scr
++
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
+new file mode 100644
+index 000000000000..6f0b30acb674
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
+@@ -0,0 +1,69 @@
++This document describes overlays provided in the kernel packages
++For generic Armbian overlays documentation please see
++https://docs.armbian.com/User-Guide_Allwinner_overlays/
++
++### Platform:
++
++rockchip (Rockchip)
++
++### Provided overlays:
++
++- i2c0, i2c1, spi-spidev, uart0, uart1, pwm1, pwm2, pwm9
++
++### Overlay details:
++
++### i2c0
++
++Activates TWI/I2C bus I2C3 but it will be named as I2C0 on the userspace
++
++I2C3/I2C0 pins (SCL, SDA): GPIO3B.5, GPIO3B.6
++
++### i2c1
++
++Activates TWI/I2C bus I2C1
++
++I2C1 pins (SCL, SDA): GPIO0B.3, GPIO0B.4
++
++### spi-spidev
++
++Activates SPIdev device node (/dev/spidev0.0) for userspace SPI access,
++
++SPI 0 pins (MOSI, MISO, SCK, CS): GPIO2D.1, GPIO2D.0, GPIO2D.3, GPIO2D.2
++
++Parameters:
++
++param_spidev_max_freq (int)
++	Maximum SPIdev frequency
++	Optional
++	Default: 1000000
++	Range: 3000 - 100000000
++
++### uart0
++
++Activates UART0 (alias to serial1)
++
++UART0 pins (RX, TX): GPIO3D.7, GPIO3D.6
++
++### uart1
++
++Activates UART1 (alias to serial0)
++
++UART1 pins (RX, TX): GPIO0C.0, GPIO0C.1
++
++### pwm1
++
++Activates PWM1 (pwm1_m1)
++
++PWM1 pins: GPIO0B.5
++
++### pwm2
++
++Activates PWM2 (pwm2_m1)
++
++PWM2 pins: GPIO0B.6
++
++### pwm9
++
++Activates PWM9 (pwm9_m0)
++
++PWM9 pins: GPIO3B.2
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
+new file mode 100644
+index 000000000000..3bde2523b698
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
+@@ -0,0 +1,7 @@
++# overlays fixup script
++# implements (or rather substitutes) overlay arguments functionality
++# using u-boot scripting, environment variables and "fdt" command
++
++if test -n "${param_spidev_max_freq}"; then
++    fdt set /spi@fe610000/spidev spi-max-frequency "<${param_spidev_max_freq}>"
++fi
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c0.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c0.dts
+new file mode 100644
+index 000000000000..a6942df06650
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c0.dts
+@@ -0,0 +1,14 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// i2c3 aliased with i2c0.
++		// This activates i2c3 but it will be named as i2c0 on the userspace.
++		target = <&i2c3>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c1.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c1.dts
+new file mode 100644
+index 000000000000..344161c2d6db
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c1.dts
+@@ -0,0 +1,12 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		target = <&i2c1>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm1.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm1.dts
+new file mode 100644
+index 000000000000..0b78ad96ba8b
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm1.dts
+@@ -0,0 +1,13 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// pwmchip0, pwm@fdd70010
++		target = <&pwm1>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm2.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm2.dts
+new file mode 100644
+index 000000000000..c7f1898e5903
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm2.dts
+@@ -0,0 +1,13 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// pwmchip1, pwm@fdd70020
++		target = <&pwm2>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm9.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm9.dts
+new file mode 100644
+index 000000000000..7f52929e787c
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pwm9.dts
+@@ -0,0 +1,13 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// pwmchip3, pwm@fe6f0010
++		target = <&pwm9>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts
+new file mode 100644
+index 000000000000..f25e855704ec
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts
+@@ -0,0 +1,22 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		target = <&spi0>;
++
++		__overlay__ {
++			status = "okay";
++			#address-cells = <1>;
++			#size-cells = <0>;
++
++			spidev: spidev@0 {
++				status = "okay";
++				compatible = "armbian,spi-dev";
++				reg = <0>;
++				/* spi default max clock 100Mhz */
++				spi-max-frequency = <100000000>;
++			};
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0-rts_cts.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0-rts_cts.dts
+new file mode 100644
+index 000000000000..fb855965f9ae
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0-rts_cts.dts
+@@ -0,0 +1,14 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// uart1 aliased with serial0.
++		target = <&uart1>;
++
++		__overlay__ {
++			status = "okay";
++			pinctrl-names = "not_use_it", "default";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts
+new file mode 100644
+index 000000000000..e57ba5499820
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts
+@@ -0,0 +1,13 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// uart1 aliased with serial0.
++		target = <&uart1>;
++
++		__overlay__ {
++			status = "okay";
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts
+new file mode 100644
+index 000000000000..cdc75c4f2873
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts
+@@ -0,0 +1,15 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	fragment@0 {
++		// uart0 aliased with serial1.
++		target = <&uart0>;
++
++		__overlay__ {
++			status = "okay";
++
++			dma-names = "tx", "rx";
++		};
++	};
++};
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 1680499136ee..4f4a55341f45 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m,
+ 
+ always-y			+= $(dtb-y)
+ 
++# Overlay targets
++extra-y                         += $(dtbo-y) $(scr-y) $(dtbotxt-y)
++
+ # Add subdir path
+ 
+ ifneq ($(obj),.)
+-- 
+Armbian
+