meson: bump current to v6.1 and edge to v6.2 (#4843)

* meson: bump current to v6.1 and edge to v6.2

config/kernel/linux-meson-edge.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.1.0 Kernel Configuration
+# Linux/arm 6.2.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -66,7 +66,6 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -137,6 +136,7 @@ CONFIG_TREE_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
@@ -159,6 +159,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features
 
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -207,6 +208,7 @@ CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_EXPERT=y
@@ -232,6 +234,7 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -445,7 +448,6 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=16
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=0
 CONFIG_HZ_FIXED=0
 CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
@@ -608,6 +610,7 @@ CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -678,6 +681,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+CONFIG_FUNCTION_ALIGNMENT=0
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -808,7 +812,8 @@ CONFIG_ZSMALLOC=m
 #
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB is not set
+# CONFIG_SLOB_DEPRECATED is not set
+# CONFIG_SLUB_TINY is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
@@ -1045,6 +1050,7 @@ CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
@@ -1059,7 +1065,6 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
@@ -1595,6 +1600,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_6LOWPAN=m
 CONFIG_BT_LEDS=y
 CONFIG_BT_MSFTEXT=y
@@ -1613,6 +1619,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1632,6 +1639,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
+# CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
@@ -1648,6 +1656,7 @@ CONFIG_AF_RXRPC_IPV6=y
 CONFIG_AF_RXRPC_INJECT_LOSS=y
 CONFIG_AF_RXRPC_DEBUG=y
 CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
 # CONFIG_MCTP is not set
@@ -1715,7 +1724,6 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCIE_PTM is not set
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
@@ -1875,7 +1883,6 @@ 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=m
 # CONFIG_EFI_TEST is not set
@@ -1927,6 +1934,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_DRBD=m
@@ -2354,7 +2362,6 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_MICROSOFT is not set
 # CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETERION is not set
@@ -2596,6 +2603,7 @@ CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921E is not set
 CONFIG_MT7921S=m
 CONFIG_MT7921U=m
+# CONFIG_MT7996E is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -2788,6 +2796,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_TIOCSTI=y
 CONFIG_LDISC_AUTOLOAD=y
 
 #
@@ -2836,6 +2845,7 @@ CONFIG_TTY_PRINTK=y
 CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2851,8 +2861,6 @@ CONFIG_DEVPORT=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
-CONFIG_RANDOM_TRUST_CPU=y
-CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
@@ -2970,10 +2978,12 @@ CONFIG_SPI_MESON_SPIFC=y
 # CONFIG_SPI_MICROCHIP_CORE is not set
 # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
 # CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PCI1XXXX is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_SN_F_OSPI is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
@@ -3123,6 +3133,7 @@ CONFIG_GPIO_SYSCON=y
 # Virtual GPIO drivers
 #
 # CONFIG_GPIO_AGGREGATOR is not set
+# CONFIG_GPIO_LATCH is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
 # CONFIG_GPIO_SIM is not set
@@ -3163,7 +3174,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -3425,6 +3435,7 @@ CONFIG_BCMA_POSSIBLE=y
 CONFIG_MFD_CORE=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_SMPRO is not set
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -3449,7 +3460,6 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_IQS62X is not set
@@ -3509,6 +3519,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS65219 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
@@ -3595,6 +3606,7 @@ CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT5759 is not set
 # CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6190 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
@@ -3926,7 +3938,6 @@ CONFIG_VIDEO_MESON_GE2D=m
 #
 # Aspeed media platform drivers
 #
-# CONFIG_VIDEO_ASPEED is not set
 
 #
 # Atmel media platform drivers
@@ -3955,6 +3966,10 @@ CONFIG_VIDEO_MESON_GE2D=m
 # Mediatek media platform drivers
 #
 
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
 #
 # NVidia media platform drivers
 #
@@ -4016,6 +4031,8 @@ CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VISL=m
+CONFIG_VISL_DEBUGFS=y
 # CONFIG_DVB_TEST_DRIVERS is not set
 CONFIG_MEDIA_COMMON_OPTIONS=y
 
@@ -4079,12 +4096,14 @@ CONFIG_VIDEO_MT9V011=m
 # CONFIG_VIDEO_OG01A1B is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV08D10 is not set
+# CONFIG_VIDEO_OV08X40 is not set
 # CONFIG_VIDEO_OV13858 is not set
 # CONFIG_VIDEO_OV13B10 is not set
 CONFIG_VIDEO_OV2640=m
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV4689 is not set
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
@@ -4108,11 +4127,11 @@ CONFIG_VIDEO_OV7640=m
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
@@ -4182,6 +4201,7 @@ CONFIG_VIDEO_WM8775=m
 # CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TC358746 is not set
 # CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
 # CONFIG_VIDEO_TVP7002 is not set
@@ -4467,6 +4487,7 @@ CONFIG_DVB_SP2=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_NOMODESET=y
 # CONFIG_IMX_IPUV3_CORE is not set
 CONFIG_DRM=y
 # CONFIG_DRM_DEBUG_MM is not set
@@ -4638,7 +4659,6 @@ CONFIG_DRM_LIMA=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_NOMODESET=y
 
 #
 # Frame buffer Devices
@@ -4738,6 +4758,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_LOGO is not set
 # end of Graphics support
 
+# CONFIG_DRM_ACCEL is not set
 CONFIG_SOUND=m
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
@@ -5010,6 +5031,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8940 is not set
 # CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8961 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
@@ -5205,7 +5227,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
@@ -5259,6 +5280,10 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
 # CONFIG_USB_CDNS_SUPPORT is not set
 # CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_DWC3 is not set
@@ -5369,9 +5394,7 @@ CONFIG_USB_EZUSB_FX2=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
-CONFIG_USB_GPIO_VBUS=y
 # CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
@@ -5389,7 +5412,6 @@ CONFIG_U_SERIAL_CONSOLE=y
 # USB Peripheral Controller
 #
 # CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_PXA27X is not set
@@ -5862,6 +5884,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # end of Generic IOMMU Pagetable Support
 
 CONFIG_IOMMU_DEBUGFS=y
+# CONFIG_IOMMUFD is not set
 # CONFIG_ARM_SMMU is not set
 
 #
@@ -6013,6 +6036,8 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_KX022A_SPI is not set
+# CONFIG_IIO_KX022A_I2C is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_MC3230 is not set
@@ -6034,6 +6059,7 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Analog to digital converters
 #
+# CONFIG_AD4130 is not set
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
@@ -6068,6 +6094,7 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1118 is not set
 # CONFIG_MAX11205 is not set
+# CONFIG_MAX11410 is not set
 # CONFIG_MAX1241 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX9611 is not set
@@ -6100,6 +6127,7 @@ CONFIG_MESON_SARADC=m
 #
 # Analog to digital and digital to analog converters
 #
+# CONFIG_AD74115 is not set
 # CONFIG_AD74413R is not set
 # end of Analog to digital and digital to analog converters
 
@@ -6228,6 +6256,7 @@ CONFIG_MESON_SARADC=m
 #
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
+# CONFIG_ADF4377 is not set
 # CONFIG_ADMV1013 is not set
 # CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
@@ -6480,6 +6509,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=y
 # CONFIG_TMP117 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
+# CONFIG_MAX30208 is not set
 # CONFIG_MAX31856 is not set
 # CONFIG_MAX31865 is not set
 # end of Temperature sensors
@@ -6564,6 +6594,7 @@ CONFIG_PHY_MESON_CVBS_DAC=y
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
+# CONFIG_MESON_DDR_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -6797,8 +6828,10 @@ CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y
+CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -6877,6 +6910,7 @@ CONFIG_NFS_DEBUG=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
+CONFIG_NFSD_V2=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
@@ -7053,7 +7087,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -7285,6 +7318,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=m
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
@@ -7407,6 +7441,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
 # end of Library routines
@@ -7467,6 +7502,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 # end of Generic Kernel Debugging Instruments
 
@@ -7588,6 +7624,7 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -7660,6 +7697,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 #
 # CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
@@ -7679,7 +7717,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_STRING_SELFTEST is not set
 # CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_SCANF is not set
@@ -7688,7 +7725,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set

config/sources/families/include/meson_common.inc

@@ -36,16 +36,16 @@ esac
 case $BRANCH in
 	current)
 
-		export KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-5.15.y"
+		export KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+		KERNELBRANCH="branch:linux-6.1.y"
 		KERNELPATCHDIR='meson-'$BRANCH
 
 		;;
 
 	edge)
 
-		export KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-6.1.y"
+		export KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel.
+		KERNELBRANCH="branch:linux-6.2.y"
 		KERNELPATCHDIR='meson-'$BRANCH
 
 		;;

patch/kernel/archive/meson-5.15/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch

@@ -1,73 +0,0 @@
-Revert "mmc: core: Set HS clock speed before sending HS CMD13"
-
-This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0.
----
- drivers/mmc/core/mmc.c | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index efa95dc4fc4..e7ea45386c2 100644
---- a/drivers/mmc/core/mmc.c
-+++ b/drivers/mmc/core/mmc.c
-@@ -1384,17 +1384,13 @@ static int mmc_select_hs400es(struct mmc_card *card)
- 		goto out_err;
- 	}
- 
--	/*
--	 * Bump to HS timing and frequency. Some cards don't handle
--	 * SEND_STATUS reliably at the initial frequency.
--	 */
- 	mmc_set_timing(host, MMC_TIMING_MMC_HS);
--	mmc_set_bus_speed(card);
--
- 	err = mmc_switch_status(card, true);
- 	if (err)
- 		goto out_err;
- 
-+	mmc_set_clock(host, card->ext_csd.hs_max_dtr);
-+
- 	/* Switch card to DDR with strobe bit */
- 	val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE;
- 	err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-@@ -1452,7 +1448,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
- static int mmc_select_hs200(struct mmc_card *card)
- {
- 	struct mmc_host *host = card->host;
--	unsigned int old_timing, old_signal_voltage, old_clock;
-+	unsigned int old_timing, old_signal_voltage;
- 	int err = -EINVAL;
- 	u8 val;
- 
-@@ -1483,17 +1479,8 @@ static int mmc_select_hs200(struct mmc_card *card)
- 				   false, true, MMC_CMD_RETRIES);
- 		if (err)
- 			goto err;
--
--		/*
--		 * Bump to HS timing and frequency. Some cards don't handle
--		 * SEND_STATUS reliably at the initial frequency.
--		 * NB: We can't move to full (HS200) speeds until after we've
--		 * successfully switched over.
--		 */
- 		old_timing = host->ios.timing;
--		old_clock = host->ios.clock;
- 		mmc_set_timing(host, MMC_TIMING_MMC_HS200);
--		mmc_set_clock(card->host, card->ext_csd.hs_max_dtr);
- 
- 		/*
- 		 * For HS200, CRC errors are not a reliable way to know the
-@@ -1506,10 +1493,8 @@ static int mmc_select_hs200(struct mmc_card *card)
- 		 * mmc_select_timing() assumes timing has not changed if
- 		 * it is a switch error.
- 		 */
--		if (err == -EBADMSG) {
--			mmc_set_clock(host, old_clock);
-+		if (err == -EBADMSG)
- 			mmc_set_timing(host, old_timing);
--		}
- 	}
- err:
- 	if (err) {
--- 
-2.25.1
-

patch/kernel/archive/meson-5.15/board_odroidc1/dts-Enable-HDMI.patch

@@ -1,121 +0,0 @@
-From 2954b682a71fad9d912c68737556259dabf3dcec Mon Sep 17 00:00:00 2001
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Date: Fri, 20 Mar 2020 15:17:51 +0100
-Subject: [PATCH 065/122] ARM: dts: meson8b: odroid-c1: enable HDMI for the
- Odroid-C1 - WiP
-
-WiP
-
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
----
- arch/arm/boot/dts/meson8b-odroidc1.dts | 73 ++++++++++++++++++++++++++
- 1 file changed, 73 insertions(+)
-
-diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts
-index 04cce559980..ef52033561c 100644
---- a/arch/arm/boot/dts/meson8b-odroidc1.dts
-+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts
-@@ -32,6 +32,17 @@ emmc_pwrseq: emmc-pwrseq {
- 		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
- 	};
- 
-+	hdmi-connector {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_connector_in: endpoint {
-+				remote-endpoint = <&hdmi_tx_tmds_out>;
-+			};
-+		};
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 		blue {
-@@ -93,6 +104,50 @@ rtc32k_xtal: rtc32k-xtal-clk {
- 		#clock-cells = <0>;
- 	};
- 
-+	sound {
-+		compatible = "amlogic,gx-sound-card";
-+		model = "M8B-ODROID-C1";
-+
-+		assigned-clocks = <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>;
-+
-+		dai-link-0 {
-+			sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
-+		};
-+
-+		dai-link-1 {
-+			sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;
-+		};
-+
-+		dai-link-2 {
-+			sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
-+			dai-format = "i2s";
-+			mclk-fs = <256>;
-+
-+			codec-0 {
-+				sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
-+			};
-+		};
-+
-+		dai-link-3 {
-+			sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;
-+
-+			codec-0 {
-+				sound-dai = <&hdmi_tx 1>;
-+			};
-+		};
-+
-+		dai-link-4 {
-+			sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
-+
-+			codec-0 {
-+				sound-dai = <&hdmi_tx 0>;
-+			};
-+		};
-+	};
-+
- 	vcc_1v8: regulator-vcc-1v8 {
- 		/*
- 		 * RICHTEK RT9179 configured for a fixed output voltage of
-@@ -187,6 +242,12 @@ vdd_rtc: regulator-vdd-rtc {
- 	};
- };
- 
-+&aiu {
-+	status = "okay";
-+	pinctrl-0 = <&spdif_out_1_pins>;
-+	pinctrl-names = "default";
-+};
-+
- &cpu0 {
- 	cpu-supply = <&vcck>;
- };
-@@ -298,6 +359,18 @@ usb-hub {
- 	};
- };
- 
-+&hdmi_tx {
-+	status = "okay";
-+	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&hdmi_tx_tmds_port {
-+	hdmi_tx_tmds_out: endpoint {
-+		remote-endpoint = <&hdmi_connector_in>;
-+	};
-+};
-+
- &ir_receiver {
- 	status = "okay";
- 	pinctrl-0 = <&ir_recv_pins>;
--- 
-2.25.1
-

patch/kernel/archive/meson-5.15/board_onecloud/0001-add-dts.patch

@@ -1,431 +0,0 @@
-Add dts
-
----
- arch/arm/boot/dts/Makefile             |   1 +
- arch/arm/boot/dts/meson8b-onecloud.dts | 402 +++++++++++++++++++++++++
- 2 files changed, 403 insertions(+)
- create mode 100644 arch/arm/boot/dts/meson8b-onecloud.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 7a72fc636a7a..9f9ddbf04128 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -365,6 +365,7 @@ dtb-$(CONFIG_MACH_MESON8) += \
- 	meson8b-ec100.dtb \
- 	meson8b-mxq.dtb \
- 	meson8b-odroidc1.dtb \
-+	meson8b-onecloud.dtb \
- 	meson8m2-mxiii-plus.dtb
- dtb-$(CONFIG_ARCH_MMP) += \
- 	pxa168-aspenite.dtb \
-diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts
-new file mode 100644
-index 000000000000..d517e45e22ba
---- /dev/null
-+++ b/arch/arm/boot/dts/meson8b-onecloud.dts
-@@ -0,0 +1,402 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Author: hzyitc
-+ */
-+
-+/dts-v1/;
-+#include "meson8b.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "Xunlei OneCloud";
-+	compatible = "xunlei,onecloud", "amlogic,meson8b";
-+
-+	aliases {
-+		serial0 = &uart_AO;
-+		mmc0 = &sd_card_slot;
-+		mmc1 = &sdhc;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x40000000 0x40000000>;
-+	};
-+
-+	emmc_pwrseq: emmc-pwrseq {
-+		compatible = "mmc-pwrseq-emmc";
-+		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	button {
-+		// compatible = "gpio-keys-polled";
-+		// poll-interval = <100>;
-+
-+		compatible = "gpio-keys";
-+
-+		autorepeat;
-+
-+		reset-button {
-+			label = "reset";
-+			linux,code = <BTN_0>;
-+
-+			// gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_LOW>;
-+
-+			interrupt-parent = <&gpio_intc>;
-+			interrupts = <5 IRQ_TYPE_LEVEL_LOW>; // GPIOAO 5
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		red {
-+			label = "onecloud:red:alive";
-+			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
-+
-+			default-state = "on";
-+			linux,default-trigger = "default-on";
-+		};
-+
-+		green {
-+			label = "onecloud:green:alive";
-+			gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
-+
-+			default-state = "off";
-+			linux,default-trigger = "mmc1";
-+		};
-+
-+		blue {
-+			label = "onecloud:blue:alive";
-+			gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>;
-+
-+			default-state = "off";
-+			linux,default-trigger = "usb-host";
-+		};
-+	};
-+
-+	p12v: regulator-p12v {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "P12V";
-+		regulator-min-microvolt = <12000000>;
-+		regulator-max-microvolt = <12000000>;
-+	};
-+
-+	vcc_5v: regulator-vcc-5v {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "VCC5V";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+
-+		vin-supply = <&p12v>;
-+
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	vcc_3v3: regulator-vcc-3v3 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "VCC3V3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		vin-supply = <&p12v>;
-+
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	vcc_1v8: regulator-vcc-1v8 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "VCC1V8";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+
-+		vin-supply = <&p12v>;
-+
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	vcc_ddr: regulator-vcc-ddr {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "VCC_DDR";
-+		regulator-min-microvolt = <1500000>;
-+		regulator-max-microvolt = <1500000>;
-+
-+		vin-supply = <&vcc_3v3>;
-+
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	vcc_core: regulator-vcc-core {
-+		compatible = "pwm-regulator";
-+
-+		regulator-name = "VCC_CORE";
-+
-+		//   +---------------------------------------------------+
-+		//   |           The actual mapping in phyical           |
-+		//   +------+--------+--------+--------+--------+--------+
-+		//   |      |  100%  |   60%  |   30%  |   10%  |   0%   |
-+		//   +------+--------+--------+--------+--------+--------+
-+		//   | V1.0 |  677mV |  857mV |  992mV | 1082mV | 1127mV |
-+		//   | V1.3 | 1116mV | 1121mV | 1125mV | 1128mV | 1129mV |
-+		//   +------+--------+--------+--------+--------+--------+
-+		//
-+		// According to meson8b.dtsi, the CPU should be able to
-+		// run at 504MHz with 870mV. But this regulator supplies
-+		// not only CPU but also GPU. And according to the users'
-+		// tests on V1.0, we need such higher voltages.
-+
-+		pwms = <&pwm_cd 1 12001 0>;	// PWM_D
-+		pwm-dutycycle-range = <10 0>;
-+		regulator-min-microvolt = <860000>;
-+		regulator-max-microvolt = <1140000>;
-+
-+		pwm-supply = <&p12v>;
-+
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&pwm_cd {
-+	status = "okay";
-+	pinctrl-0 = <&pwm_c1_pins>, <&pwm_d_pins>;
-+	pinctrl-names = "default";
-+	clocks = <&xtal>, <&xtal>;
-+	clock-names = "clkin0", "clkin1";
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vcc_core>;
-+};
-+
-+&mali {
-+	// commented to allow cpufreq tweaking
-+	// mali-supply = <&vcc_core>;
-+};
-+
-+&gpio {
-+	gpio-line-names =
-+		// 0-3 Bank GPIOX 0-3
-+		"7U1_PIN_18", "7U1_PIN_19",
-+		"7U1_PIN_14", "7U1_PIN_15",
-+		// 4-7 Bank GPIOX 4-7
-+		"7U1_PIN_27", "7U1_PIN_25",
-+		"7U1_PIN_28", "7U1_PIN_26",
-+		// 8 Bank GPIOX 8
-+		"R_RightOf_LED",
-+		// 9 Bank GPIOX 9
-+		"7U1_PIN_16",
-+		// 10 Bank GPIOX 10
-+		"",
-+		// 11 Bank GPIOX 11
-+		"7U1_PIN_12",
-+		// 12-16 Bank GPIOX 16-20
-+		"7U1_PIN_43", "7U1_PIN_42",
-+		"7U1_PIN_41(Resistor)", "7U1_PIN_44",
-+		"7U1_PIN_34",
-+		// 17 Bank GPIOX 21
-+		"7U1_PIN_13",
-+
-+		// 18 Bank GPIOY 0
-+		"Resistor_TopOf_LED",
-+		// 19-20 Bank GPIOY 1-3
-+		"", "",
-+		// 21-26 Bank GPIOY 6-11
-+		"", "",
-+		"", "",
-+		"", "",
-+		// 27 Bank GPIOY 12
-+		"",
-+		// 28-29 Bank GPIOY 13-14
-+		"Left_BottomOf_CPU",  "Right_BottomOf_CPU",
-+
-+		// 30 Bank GPIODV 9
-+		"VCCK_PWM (PWM_C)",
-+		// 31-35 Bank GPIODV 24-28
-+		"I2CA_SDA", "I2CA_SCL",
-+		"I2CB_SDA", "I2CB_SCL",
-+		"VDDEE_PWM (PWM_D)",
-+		// 36 Bank GPIODV 29
-+		"",
-+
-+		// 37-39 Bank GPIOH 0-2
-+		"HDMI_HPD", "HDMI_I2C_SDA", "HDMI_I2C_SCL",
-+		// 40-46 Bank GPIOH 3-9
-+		"ETH_PHY_INTR", "ETH_PHY_NRST",
-+		"ETH_TXD1", "ETH_TXD0",
-+		"ETH_TXD3", "ETH_TXD2",
-+		"ETH_RGMII_TX_CLK",
-+
-+		// 47-53 Bank CARD 0-6
-+		"SD_D1", "SD_D0",
-+		"SD_CLK", "SD_CMD",
-+		"SD_D3", "SD_D2",
-+		"SD_CD",
-+
-+		// 54-65 Bank BOOT 0-11
-+		"EMMC_D0", "EMMC_D1",
-+		"EMMC_D2", "EMMC_D3",
-+		"EMMC_D4", "EMMC_D5",
-+		"EMMC_D6", "EMMC_D7",
-+		"EMMC_CLK", "EMMC_RSTn",
-+		"EMMC_CMD", "BOOT_SEL",
-+		// 66-72 Bank BOOT 12-18
-+		"", "",
-+		"", "",
-+		"", "",
-+		"",
-+
-+		// 73-74 Bank DIF 0P 0N
-+		"ETH_RXD1", "ETH_RXD0",
-+		// 75-76 Bank DIF 1P 1N
-+		"ETH_RX_DV", "RGMII_RX_CLK",
-+		// 77-78 Bank DIF 2P 2N
-+		"ETH_RXD3", "ETH_RXD2",
-+		// 79-80 Bank DIF 3P 3N
-+		"ETH_TXEN", "ETH_PHY_REF_CLK_25MOUT",
-+		// 81-82 Bank DIF 4P 4N
-+		"ETH_MDC", "ETH_MDIO";
-+};
-+
-+&gpio_ao {
-+	gpio-line-names =
-+		// 0-1 Band GPIOAO 0-1
-+		"UART TX", "UART RX",
-+		// 2-4 Band GPIOAO 2-4
-+		"RED_LED", "GREEN_LED", "BLUE_LED",
-+		// 5 Band GPIOAO 5
-+		"BUTTON",
-+		// 6 Band GPIOAO 6
-+		"",
-+		// 7 Band GPIOAO 7
-+		"IR_IN",
-+		// 8 Band GPIOAO 8-13
-+		"", "",
-+		"", "",
-+		"", "",
-+
-+		// 14 Band GPIO_BSD_EN
-+		"",
-+		// 15 GPIO_TEST_N
-+		"";
-+};
-+
-+&ethmac {
-+	status = "okay";
-+
-+	pinctrl-0 = <&eth_rgmii_pins>;
-+	pinctrl-names = "default";
-+
-+	phy-handle = <&eth_phy>;
-+	phy-mode = "rgmii-id";
-+
-+	mdio {
-+		compatible = "snps,dwmac-mdio";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		// Realtek RTL8211F (0x001cc916)
-+		eth_phy: ethernet-phy@0 {
-+			reg = <0>;
-+
-+			reset-assert-us = <10000>;
-+			reset-deassert-us = <80000>;
-+			reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
-+
-+			interrupt-parent = <&gpio_intc>;
-+			interrupts = <17 IRQ_TYPE_LEVEL_LOW>; // GPIOH 3
-+		};
-+	};
-+};
-+
-+&saradc {
-+	status = "okay";
-+	vref-supply = <&vcc_1v8>;
-+};
-+
-+// eMMC
-+&sdhc {
-+	status = "okay";
-+
-+	pinctrl-0 = <&sdxc_c_pins>;
-+	pinctrl-names = "default";
-+
-+	bus-width = <8>;
-+	max-frequency = <100000000>;
-+
-+	disable-wp;
-+	cap-mmc-highspeed;
-+	mmc-hs200-1_8v;
-+	no-sdio;
-+
-+	mmc-pwrseq = <&emmc_pwrseq>;
-+
-+	vmmc-supply = <&vcc_3v3>;
-+	// vqmmc-supply = <&vcc_3v3>;
-+};
-+
-+&sdio {
-+	status = "okay";
-+
-+	pinctrl-0 = <&sd_b_pins>;
-+	pinctrl-names = "default";
-+
-+	// SD card
-+	sd_card_slot: slot@1 {
-+		compatible = "mmc-slot";
-+		reg = <1>;
-+		status = "okay";
-+
-+		bus-width = <4>;
-+		no-sdio;
-+		cap-mmc-highspeed;
-+		cap-sd-highspeed;
-+		disable-wp;
-+
-+		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
-+
-+		vmmc-supply = <&vcc_3v3>;
-+		// vqmmc-supply = <&vcc_3v3>;
-+	};
-+};
-+
-+&uart_AO {
-+	status = "okay";
-+	pinctrl-0 = <&uart_ao_a_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&usb0_phy {
-+	status = "okay";
-+};
-+
-+&usb0 {
-+	status = "okay";
-+};
-+
-+&usb1_phy {
-+	status = "okay";
-+};
-+
-+&usb1 {
-+	status = "okay";
-+};
-+
-+&ir_receiver {
-+	status = "okay";
-+	pinctrl-0 = <&ir_recv_pins>;
-+	pinctrl-names = "default";
-+};
--- 
-2.25.1
-

patch/kernel/archive/meson-5.15/board_onecloud/0002-dts-Support-HDMI.patch

@@ -1,92 +0,0 @@
-dts: Support HDMI
-
----
- arch/arm/boot/dts/meson8b-onecloud.dts | 58 ++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
-diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts
-index 050b2e65348..69fff33c496 100644
---- a/arch/arm/boot/dts/meson8b-onecloud.dts
-+++ b/arch/arm/boot/dts/meson8b-onecloud.dts
-@@ -32,6 +32,48 @@ emmc_pwrseq: emmc-pwrseq {
- 		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
- 	};
- 
-+	hdmi-connector {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_connector_in: endpoint {
-+				remote-endpoint = <&hdmi_tx_tmds_out>;
-+			};
-+		};
-+	};
-+
-+	sound {
-+		compatible = "amlogic,gx-sound-card";
-+
-+		assigned-clocks = <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>;
-+
-+		dai-link-0 {
-+			sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
-+		};
-+
-+		dai-link-1 {
-+			sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
-+			dai-format = "i2s";
-+			mclk-fs = <256>;
-+
-+			codec-0 {
-+				sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
-+			};
-+		};
-+
-+		dai-link-2 {
-+			sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
-+
-+			codec-0 {
-+				sound-dai = <&hdmi_tx 0>;
-+			};
-+		};
-+	};
-+
- 	button {
- 		// compatible = "gpio-keys-polled";
- 		// poll-interval = <100>;
-@@ -142,6 +184,10 @@ vcc_core: regulator-vcc-core {
- 	};
- };
- 
-+&aiu {
-+	status = "okay";
-+};
-+
- &cpu0 {
- 	cpu-supply = <&vcc_core>;
- };
-@@ -150,6 +196,18 @@ &mali {
- 	mali-supply = <&vcc_core>;
- };
- 
-+&hdmi_tx {
-+	status = "okay";
-+	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&hdmi_tx_tmds_port {
-+	hdmi_tx_tmds_out: endpoint {
-+		remote-endpoint = <&hdmi_connector_in>;
-+	};
-+};
-+
- &gpio {
- 	gpio-line-names =
- 		// 0-3 Bank GPIOX 0-3
--- 
-2.25.1
-

patch/kernel/archive/meson-5.15/board_onecloud/usb-disable-ACA-check.patch

@@ -1,33 +0,0 @@
-USB: Disable ACA check
-
-In V1.3, USB0 fails in this check.
-But it can work normally.
-So just disable this check.
-
----
- drivers/phy/amlogic/phy-meson8b-usb2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c
-index dd96763911b8..dff1bc44f1ca 100644
---- a/drivers/phy/amlogic/phy-meson8b-usb2.c
-+++ b/drivers/phy/amlogic/phy-meson8b-usb2.c
-@@ -197,13 +197,13 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
- 			udelay(ACA_ENABLE_COMPLETE_TIME);
- 
- 			regmap_read(priv->regmap, REG_ADP_BC, &reg);
--			if (reg & REG_ADP_BC_ACA_PIN_FLOAT) {
-+			/*if (reg & REG_ADP_BC_ACA_PIN_FLOAT) {
- 				dev_warn(&phy->dev, "USB ID detect failed!\n");
- 				clk_disable_unprepare(priv->clk_usb);
- 				clk_disable_unprepare(priv->clk_usb_general);
- 				reset_control_rearm(priv->reset);
- 				return -EINVAL;
--			}
-+			}*/
- 		}
- 	}
- 
--- 
-2.25.1
-

patch/kernel/archive/meson-5.15/generate-uImage-instand-of-zImage.patch

@@ -1,27 +0,0 @@
-Generate uImage instand of zImage
-
----
- scripts/package/builddeb | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 91a502bb9..196889f1d 100755
---- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -218,6 +218,13 @@ if [ "$ARCH" != "um" ]; then
- 	create_package linux-libc-dev debian/linux-libc-dev
- fi
- 
-+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-+cat >> $tmpdir/DEBIAN/postinst <<EOT
-+mkimage -A arm -O linux -T kernel -C none -a 0x2080000 -e 0x2080000 -n "Linux" -d /boot/zImage /boot/uImage  > /dev/null 2>&1
-+rm -f /boot/zImage
-+exit 0
-+EOT
-+
- create_package "$packagename" "$tmpdir"
- 
- if [ -n "$BUILD_DEBUG" ] ; then
--- 
-2.25.1
-

patch/kernel/meson-current

@@ -1 +1 @@
-archive/meson-5.15
+archive/meson-6.1