bump rockchip64 edge kernel to v6.11

config/kernel/linux-rockchip64-edge.config

@@ -1,24 +1,20 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.4 Kernel Configuration
+# Linux/arm64 6.11.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130200
+CONFIG_GCC_VERSION=110200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=125
+CONFIG_PAHOLE_VERSION=122
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -177,7 +173,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -258,7 +254,6 @@ CONFIG_CACHESTAT_SYSCALL=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
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -398,9 +393,7 @@ CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
-# CONFIG_ARM64_ERRATUM_3312417 is not set
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -444,7 +437,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -545,6 +537,7 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
+# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -715,8 +708,6 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
-# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -812,7 +803,6 @@ CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
@@ -903,6 +893,7 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
 CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold"
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -915,6 +906,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1560,6 +1552,7 @@ CONFIG_NET_DSA_TAG_RTL8_4=m
 CONFIG_NET_DSA_TAG_LAN9303=m
 CONFIG_NET_DSA_TAG_SJA1105=m
 CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_VSC73XX_8021Q=m
 CONFIG_NET_DSA_TAG_XRS700X=m
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
@@ -2002,7 +1995,6 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_MICROCHIP_HOST is not set
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=y
 CONFIG_PCIE_ROCKCHIP_EP=y
@@ -2021,19 +2013,28 @@ CONFIG_PCIE_ROCKCHIP_EP=y
 #
 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 is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 # CONFIG_PCIE_DW_PLAT_EP is not set
+CONFIG_PCIE_ROCKCHIP_DW=y
 CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCIE_ROCKCHIP_DW_EP=y
 # end of DesignWare-based PCIe controllers
 
 #
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
+
+#
+# PLDA-based PCIe controllers
+#
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2384,6 +2385,7 @@ CONFIG_NVME_TCP=m
 CONFIG_NVME_TCP_TLS=y
 CONFIG_NVME_HOST_AUTH=y
 CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_DEBUGFS is not set
 CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_FC=m
@@ -2462,6 +2464,7 @@ CONFIG_MISC_RTSX_USB=m
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_GP_PCI1XXXX is not set
+# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -2980,6 +2983,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -3083,6 +3087,7 @@ CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
+# CONFIG_TEHUTI_TN40 is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TLAN is not set
@@ -3381,6 +3386,7 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 CONFIG_ATH11K=m
@@ -3540,6 +3546,7 @@ CONFIG_RTL8188EE=m
 CONFIG_RTL8192EE=m
 CONFIG_RTL8821AE=m
 CONFIG_RTL8192CU=m
+# CONFIG_RTL8192DU is not set
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
@@ -4191,6 +4198,7 @@ CONFIG_SPI_BITBANG=m
 CONFIG_SPI_CADENCE=m
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_CADENCE_XSPI=m
+CONFIG_SPI_CH341=m
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_PCI=m
@@ -4283,6 +4291,7 @@ CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_SX150X=y
+# CONFIG_PINCTRL_IMX_SCMI is not set
 
 #
 # Renesas pinctrl drivers
@@ -4392,6 +4401,13 @@ CONFIG_GPIO_VIRTIO=m
 CONFIG_GPIO_SIM=m
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4445,6 +4461,7 @@ CONFIG_POWER_RESET_SYSCON=y
 # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -4467,6 +4484,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1720X is not set
 CONFIG_BATTERY_MAX1721X=m
 CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
@@ -4537,6 +4555,7 @@ CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_CROS_EC=y
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -4663,9 +4682,13 @@ CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 # CONFIG_SENSORS_MP2856 is not set
 CONFIG_SENSORS_MP2888=m
+# CONFIG_SENSORS_MP2891 is not set
 # CONFIG_SENSORS_MP2975 is not set
+# CONFIG_SENSORS_MP2993 is not set
 CONFIG_SENSORS_MP5023=m
+# CONFIG_SENSORS_MP5920 is not set
 # CONFIG_SENSORS_MP5990 is not set
+# CONFIG_SENSORS_MP9941 is not set
 # CONFIG_SENSORS_MPQ7932 is not set
 # CONFIG_SENSORS_MPQ8785 is not set
 CONFIG_SENSORS_PIM4328=m
@@ -4715,6 +4738,7 @@ CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_INA3221=m
+# CONFIG_SENSORS_SPD5118 is not set
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
@@ -4874,6 +4898,7 @@ CONFIG_MFD_IQS62X=m
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 CONFIG_MFD_MAX77620=y
@@ -4952,12 +4977,15 @@ CONFIG_MFD_VX855=m
 # CONFIG_MFD_ROHM_BD718XX is not set
 CONFIG_MFD_ROHM_BD71828=m
 CONFIG_MFD_ROHM_BD957XMUF=m
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_STMFX=m
 CONFIG_MFD_ATC260X=m
 CONFIG_MFD_ATC260X_I2C=m
 # CONFIG_MFD_KHADAS_MCU is not set
 CONFIG_MFD_QCOM_PM8008=m
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_RAVE_SP_CORE=m
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
@@ -5026,6 +5054,7 @@ CONFIG_REGULATOR_PF8X00=m
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
+# CONFIG_REGULATOR_QCOM_PM8008 is not set
 CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 # CONFIG_REGULATOR_RAA215300 is not set
@@ -5147,6 +5176,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_FIXED_MINOR_RANGES=y
 CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_JPEG_HELPER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
@@ -5438,6 +5468,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
+# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -5471,6 +5502,10 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Qualcomm media platform drivers
 #
 
+#
+# Raspberry Pi media platform drivers
+#
+
 #
 # Renesas media platform drivers
 #
@@ -5553,6 +5588,8 @@ CONFIG_VIDEO_CCS_PLL=m
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 CONFIG_VIDEO_HI556=m
 CONFIG_VIDEO_HI846=m
@@ -5562,6 +5599,7 @@ CONFIG_VIDEO_IMX214=m
 CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m
 CONFIG_VIDEO_IMX274=m
+# CONFIG_VIDEO_IMX283 is not set
 CONFIG_VIDEO_IMX290=m
 # CONFIG_VIDEO_IMX296 is not set
 CONFIG_VIDEO_IMX319=m
@@ -5618,7 +5656,7 @@ CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VGXY61 is not set
 CONFIG_VIDEO_CCS=m
 CONFIG_VIDEO_ET8EK8=m
 
@@ -5757,6 +5795,8 @@ CONFIG_VIDEO_CX25840=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -5999,12 +6039,14 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_HELPER=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
@@ -6072,11 +6114,13 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_LVDS=m
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
@@ -6089,6 +6133,7 @@ CONFIG_DRM_PANEL_KHADAS_TS050=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 CONFIG_DRM_PANEL_LG_LB035Q02=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
@@ -6337,6 +6382,7 @@ CONFIG_BACKLIGHT_ADP5520=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_AAT2870=m
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=y
@@ -6596,6 +6642,7 @@ CONFIG_SND_SOC_AK4375=m
 CONFIG_SND_SOC_AK4458=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
+# CONFIG_SND_SOC_AK4619 is not set
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_AK5558=m
@@ -6641,6 +6688,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
@@ -6648,6 +6696,7 @@ CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
+# CONFIG_SND_SOC_ES8311 is not set
 CONFIG_SND_SOC_ES8316=m
 # CONFIG_SND_SOC_ES8326 is not set
 CONFIG_SND_SOC_ES8328=m
@@ -7503,6 +7552,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_TTY=m
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -7755,6 +7805,7 @@ CONFIG_IFCVF=m
 # CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
 CONFIG_VP_VDPA=m
 # CONFIG_SNET_VDPA is not set
+# CONFIG_OCTEONEP_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST_TASK=y
@@ -7919,10 +7970,10 @@ CONFIG_CROS_EC_TYPEC=m
 # CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_CROS_KUNIT_EC_PROTO_TEST is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
-# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -8001,6 +8052,7 @@ CONFIG_ROCKCHIP_MBOX=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
+CONFIG_IOMMUFD_DRIVER=y
 CONFIG_IOMMU_SUPPORT=y
 
 #
@@ -8263,6 +8315,7 @@ CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7292=m
 CONFIG_AD7298=m
+# CONFIG_AD7380 is not set
 CONFIG_AD7476=m
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
@@ -8278,7 +8331,6 @@ CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
 # CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 CONFIG_DLN2_ADC=m
 # CONFIG_ENVELOPE_DETECTOR is not set
@@ -8320,6 +8372,7 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -8373,6 +8426,7 @@ CONFIG_BME680=m
 CONFIG_BME680_I2C=m
 CONFIG_BME680_SPI=m
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 CONFIG_PMS7003=m
 # CONFIG_SCD30_CORE is not set
@@ -8428,7 +8482,6 @@ CONFIG_AD3552R=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 CONFIG_AD5686=m
 CONFIG_AD5686_SPI=m
@@ -8644,6 +8697,7 @@ CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VEML6030=m
+# CONFIG_VEML6040 is not set
 CONFIG_VEML6070=m
 # CONFIG_VEML6075 is not set
 CONFIG_VL6180=m
@@ -8821,6 +8875,7 @@ CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_DWC_CORE=m
 CONFIG_PWM_DWC=m
 # CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_GPIO=m
 # CONFIG_PWM_IQS620A is not set
 CONFIG_PWM_NTXEC=m
 # CONFIG_PWM_PCA9685 is not set
@@ -8837,7 +8892,9 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 # end of IRQ chip support
@@ -9113,9 +9170,9 @@ CONFIG_OVERLAY_FS_XINO_AUTO=y
 #
 CONFIG_NETFS_SUPPORT=m
 CONFIG_NETFS_STATS=y
+# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -9324,7 +9381,6 @@ CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
 CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_SMBDIRECT=y
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
 CONFIG_SMBFS=m
@@ -9476,12 +9532,7 @@ CONFIG_LSM="lockdown,yama,integrity,apparmor"
 #
 # Memory initialization
 #
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -9553,7 +9604,6 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
-# CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography
 
@@ -9927,7 +9977,7 @@ CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_SIGNATURE=y
-CONFIG_DIMLIB=m
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -10238,7 +10288,6 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set
@@ -10272,7 +10321,6 @@ CONFIG_TEST_XARRAY=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 CONFIG_TEST_VMALLOC=m
-# CONFIG_TEST_USER_COPY is not set
 CONFIG_TEST_BPF=m
 CONFIG_TEST_BLACKHOLE_DEV=m
 # CONFIG_FIND_BIT_BENCHMARK is not set
@@ -10296,6 +10344,7 @@ CONFIG_MEMCPY_KUNIT_TEST=m
 # CONFIG_STACKINIT_KUNIT_TEST is not set
 # CONFIG_FORTIFY_KUNIT_TEST is not set
 # CONFIG_SIPHASH_KUNIT_TEST is not set
+# CONFIG_USERCOPY_KUNIT_TEST is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_DYNAMIC_DEBUG is not set

config/sources/families/include/rockchip64_common.inc

@@ -33,7 +33,7 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.10"
+		declare -g KERNEL_MAJOR_MINOR="6.11"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;

lib/functions/compilation/patch/drivers_network.sh

@@ -515,6 +515,10 @@ driver_uwe5622() {
 		if linux-version compare "${version}" ge 6.9; then
 			process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.9.patch" "applying"
 		fi
+		
+		if linux-version compare "${version}" ge 6.11; then
+			process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.11.patch" "applying"
+		fi
 
 	fi
 }

patch/kernel/archive/rockchip64-6.10/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch

@@ -1,115 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-Date: Wed, 8 Sep 2021 17:51:34 +0200
-Subject: [ARCHEOLOGY] Bumping EDGE kernel to 5.14.y (#3125)
-
-> X-Git-Archeology: > recovered message: > * Bumping EDGE kernel to 5.14.y
-> X-Git-Archeology: > recovered message: > Meson64:
-> X-Git-Archeology: > recovered message: > - removing Odroid reboot shutdown patch since its probably not needed anymore
-> X-Git-Archeology: > recovered message: > Rockchip64:
-> X-Git-Archeology: > recovered message: > - removing Rockpi S. No interest to maintain this any further
-> X-Git-Archeology: > recovered message: > - removing PBP suspend. Doesn't align. Need inspection if some other way was mainstreamed
-> X-Git-Archeology: > recovered message: > - temporally removing Orangepi R1
-> X-Git-Archeology: > recovered message: > * Re-adding rockpis, pbp suspend, HFLPS170 wifi and cleanup
-> X-Git-Archeology: > recovered message: > * Removing deprecated patch, fixing ap6256 wifi
-> X-Git-Archeology: > recovered message: > * Re-enable Opi R1 plus, untest
-> X-Git-Archeology: > recovered message: > * Add and fix Radxa Zero
-> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
-> X-Git-Archeology:   Date: Wed, 08 Sep 2021 17:51:34 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bumping EDGE kernel to 5.14.y (#3125)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
-> X-Git-Archeology:   Date: Tue, 09 Nov 2021 18:06:34 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
-> X-Git-Archeology:   Date: Sat, 26 Feb 2022 07:46:44 +0100
-> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
-> X-Git-Archeology:   Subject: Switch rockchip64 current to linux 5.15.y (#3489)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
-> X-Git-Archeology:   Date: Tue, 03 May 2022 08:27:32 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump and freeze kernel at last known working versions (#3736)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
-> X-Git-Archeology:   Date: Sat, 28 May 2022 07:56:22 +0200
-> X-Git-Archeology:   From: Jianfeng Liu <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: update rockchip64-edge to 5.18 (#3814)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
-> X-Git-Archeology:   Date: Wed, 03 Aug 2022 22:22:55 +0200
-> X-Git-Archeology:   From: Jianfeng Liu <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: update rockchip64 edge to 5.19 (#4039)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
-> X-Git-Archeology:   Date: Tue, 25 Oct 2022 11:26:51 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump rockchip64 edge to 6.0.y (#4337)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
-> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
-> X-Git-Archeology:   Date: Fri, 05 May 2023 14:22:00 +0200
-> X-Git-Archeology:   From: amazingfate <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
-> X-Git-Archeology:
----
- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 29 ++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -143,6 +143,12 @@ arm-pmu {
- 		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
- 	};
- 
-+	cpuinfo {
-+		compatible = "rockchip,cpuinfo";
-+		nvmem-cells = <&cpu_id>;
-+		nvmem-cell-names = "id";
-+	};
-+
- 	mac_clkin: external-mac-clock {
- 		compatible = "fixed-clock";
- 		clock-frequency = <50000000>;
-@@ -150,6 +156,29 @@ mac_clkin: external-mac-clock {
- 		#clock-cells = <0>;
- 	};
- 
-+	otp: otp@ff210000 {
-+		compatible = "rockchip,rk3308-otp";
-+		reg = <0x0 0xff210000 0x0 0x4000>;
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>,
-+			 <&cru PCLK_OTP_PHY>;
-+		clock-names = "otp", "apb_pclk", "phy";
-+		resets = <&cru SRST_OTP_PHY>;
-+		reset-names = "phy";
-+
-+		/* Data cells */
-+		cpu_id: id@7 {
-+			reg = <0x07 0x10>;
-+		};
-+		cpu_leakage: cpu-leakage@17 {
-+			reg = <0x17 0x1>;
-+		};
-+		logic_leakage: logic-leakage@18 {
-+			reg = <0x18 0x1>;
-+		};
-+	};
-+
- 	psci {
- 		compatible = "arm,psci-1.0";
- 		method = "smc";
--- 
-Armbian
-

patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch

@@ -1,366 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brent Roman <genosenosor@gmail.com>
-Date: Wed, 7 Feb 2024 18:02:07 -0800
-Subject: Added Linux device tree for Rock S0
-
-Signed-off-by: Brent Roman <genosenosor@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 347 ++++++++++
- 1 file changed, 347 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
-@@ -0,0 +1,347 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2019 Akash Gajjar <akash@openedev.com>
-+ * Copyright (c) 2019 Jagan Teki <jagan@openedev.com>
-+ * Revised: 2024 Brent Roman <brent@mbari.org>
-+ */
-+
-+/dts-v1/;
-+#include "rk3308.dtsi"
-+
-+/ {
-+	model = "Radxa ROCK S0";
-+	compatible = "radxa,rock-s0", "rockchip,rk3308";
-+
-+	chosen {
-+		stdout-path = "serial0:1500000n8";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&green_led_gio>;
-+
-+		green-led {
-+			label = "rock-s0:green:power";
-+			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
-+			default-state = "on";
-+		};
-+	};
-+
-+	acodec-sound {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "rockchip,rk3308-acodec";
-+			simple-audio-card,mclk-fs = <256>;
-+			simple-audio-card,codec-hp-det;
-+			simple-audio-card,widgets =
-+				"Headphone", "Headphones";
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s_8ch_2>;
-+			};
-+			simple-audio-card,codec {
-+				sound-dai = <&codec>;
-+			};
-+	};
-+
-+	sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,mclk-fs = <256>;
-+		simple-audio-card,name = "i2s_8ch_0";
-+
-+		simple-audio-card,dai-link@1 {
-+			format = "i2s";
-+			cpu {
-+				sound-dai = <&i2s_8ch_0>;
-+			};
-+
-+			codec {
-+				sound-dai = <&pcm5102a>;
-+			};
-+		};
-+	};
-+
-+	pcm5102a: pcm5102a {
-+			#sound-dai-cells = <0>;
-+			compatible = "ti,pcm5102a";
-+			pcm510x,format = "i2s";
-+	};
-+
-+	sdio_pwrseq: sdio-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		pinctrl-0 = <&wifi_enable_h>;
-+		pinctrl-names = "default";
-+		/*
-+		 * On the module itself this is one of these (depending
-+		 * on the actual card populated):
-+		 * - SDIO_RESET_L_WL_REG_ON
-+		 * - PDN (power down when low)
-+		 */
-+		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	vcc_1v8: vcc-1v8 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_1v8";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&vcc_io>;
-+	};
-+
-+	vcc_io: vcc-io {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_io";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc_ddr: vcc-ddr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_ddr";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1500000>;
-+		regulator-max-microvolt = <1500000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_otg: vcc5v0-otg {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&otg_vbus_drv>;
-+		regulator-name = "vcc5v0_otg";
-+		regulator-always-on;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_sys: vcc5v0-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+	};
-+
-+	vdd_core: vdd-core {
-+		compatible = "pwm-regulator";
-+		pwms = <&pwm0 0 5000 1>;
-+		pwm-supply = <&vcc5v0_sys>;
-+		regulator-name = "vdd_core";
-+		regulator-min-microvolt = <827000>;
-+		regulator-max-microvolt = <1340000>;
-+		regulator-init-microvolt = <1015000>;
-+		regulator-settling-time-up-us = <250>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	vdd_log: vdd-log {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vdd_log";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1050000>;
-+		regulator-max-microvolt = <1050000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	board_antenna: board-antenna {
-+		status = "okay";
-+		compatible = "regulator-fixed";
-+		enable-active-low;
-+		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+		pinctrl-0 = <&ant_1>;
-+		pinctrl-names = "default";
-+		regulator-name = "board_antenna";
-+	};
-+};
-+
-+&codec {
-+	status = "okay";
-+	#sound-dai-cells = <0>;
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vdd_core>;
-+};
-+
-+&emmc {
-+	cap-mmc-highspeed;
-+	mmc-hs200-1_8v;
-+	non-removable;
-+	vmmc-supply = <&vcc_io>;  //was vin-supply
-+        status = "okay";
-+};
-+
-+&sdmmc {
-+	cap-mmc-highspeed;
-+	cap-sd-highspeed;
-+	disable-wp;
-+	card-detect-delay = <800>;
-+	status = "okay";
-+};
-+
-+&sdio {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	cap-sd-highspeed;
-+	cap-sdio-irq;
-+	keep-power-in-suspend;
-+	mmc-pwrseq = <&sdio_pwrseq>;
-+	non-removable;
-+	no-mmc;
-+	status = "okay";
-+
-+	AP6212: wifi@1 {
-+		compatible = "brcm,bcm4329-fmac";
-+		reg = <1>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
-+		interrupt-names = "host-wake";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&wifi_host_wake>;
-+	};
-+};
-+
-+&gmac {
-+	phy-supply = <&vcc_io>;
-+	clock_in_out = "output";
-+	assigned-clocks = <&cru SCLK_MAC>;
-+	assigned-clock-parents = <&cru SCLK_MAC_SRC>;
-+	snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
-+	snps,reset-active-low;
-+	snps,reset-delays-us = <0 50000 50000>;
-+	status = "okay";
-+};
-+
-+&i2s_8ch_0 {
-+	assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
-+	assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;
-+	rockchip,clk-trcm = <1>;
-+	#sound-dai-cells = <0>;
-+};
-+
-+&i2s_8ch_2 {
-+	status = "okay";
-+	#sound-dai-cells = <0>;
-+};
-+
-+&pinctrl {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rtc_32k>;
-+
-+	leds {
-+		green_led_gio: green-led-gpio {
-+			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	usb {
-+		otg_vbus_drv: otg-vbus-drv {
-+			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	sdio-pwrseq {
-+		wifi_enable_h: wifi-enable-h {
-+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	wifi {
-+		wifi_host_wake: wifi-host-wake {
-+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
-+		};
-+
-+	};
-+	antenna {
-+		ant_1: ant-1 {
-+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
-+		};
-+	};
-+};
-+
-+&pwm0 {
-+	status = "okay";
-+	pinctrl-0 = <&pwm0_pin_pull_down>;
-+};
-+
-+&saradc {
-+	vref-supply = <&vcc_1v8>;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	rockchip,hw-tshut-mode = <0>;		/* 0:CRU */
-+	rockchip,hw-tshut-polarity = <1>;	/* 1:HIGH */
-+	status = "okay";
-+};
-+
-+&i2c1 {
-+	status = "okay";
-+};
-+
-+&spi2 {
-+//	status = "okay";  //conflicts with UART2
-+	max-freq = <10000000>;
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+&uart4 {
-+	status = "okay";
-+
-+	bluetooth {
-+		compatible = "realtek,rtl8723bs-bt";
-+		device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
-+		host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
-+	};
-+};
-+
-+&u2phy {
-+	status = "okay";
-+
-+	u2phy_host: host-port {
-+		phy-supply = <&vcc5v0_otg>;
-+		status = "okay";
-+	};
-+
-+	u2phy_otg: otg-port {
-+		status = "okay";
-+	};
-+};
-+
-+&usb20_otg {
-+	status = "okay";
-+};
-+
-+&usb_host_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host_ohci{
-+	status = "okay";
-+};
-+
-+&wdt {
-+	status = "okay";
-+};
-+
--- 
-Armbian
-

patch/kernel/archive/rockchip64-6.10/general-net-stmmac-dwmac4-fix_PCS_duplex_mode_decode.patch

@@ -1,52 +0,0 @@
-From 85ba108a529d99c82e814eaf782a9443acf5eaed Mon Sep 17 00:00:00 2001
-From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
-Date: Tue, 6 Aug 2024 14:08:41 +0100
-Subject: net: stmmac: dwmac4: fix PCS duplex mode decode
-
-dwmac4 was decoding the duplex mode from the GMAC_PHYIF_CONTROL_STATUS
-register incorrectly, using GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK (value 1)
-rather than GMAC_PHYIF_CTRLSTATUS_LNKMOD (bit 16). Fix this.
-
-Fixes: 70523e639bf8c ("drivers: net: stmmac: reworking the PCS code.")
-Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
-Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
-Link: https://patch.msgid.link/E1sbJvd-001rGD-E3@rmk-PC.armlinux.org.uk
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/ethernet/stmicro/stmmac/dwmac4.h      | 2 --
- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-(limited to 'drivers/net/ethernet/stmicro/stmmac')
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
-index d3c5306f1c41f7..93a78fd0737b6c 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
-@@ -573,8 +573,6 @@ static inline u32 mtl_low_credx_base_addr(const struct dwmac4_addrs *addrs,
- #define GMAC_PHYIF_CTRLSTATUS_LNKSTS		BIT(19)
- #define GMAC_PHYIF_CTRLSTATUS_JABTO		BIT(20)
- #define GMAC_PHYIF_CTRLSTATUS_FALSECARDET	BIT(21)
--/* LNKMOD */
--#define GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK	0x1
- /* LNKSPEED */
- #define GMAC_PHYIF_CTRLSTATUS_SPEED_125		0x2
- #define GMAC_PHYIF_CTRLSTATUS_SPEED_25		0x1
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-index f98741d2607ec4..31c387cc5f269d 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-@@ -786,7 +786,7 @@ static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x)
- 		else
- 			x->pcs_speed = SPEED_10;
- 
--		x->pcs_duplex = (status & GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK);
-+		x->pcs_duplex = (status & GMAC_PHYIF_CTRLSTATUS_LNKMOD);
- 
- 		pr_info("Link is Up - %d/%s\n", (int)x->pcs_speed,
- 			x->pcs_duplex ? "Full" : "Half");
--- 
-cgit 1.2.3-korg
-

patch/kernel/archive/rockchip64-6.11/0000.patching_config.yaml

@@ -1,11 +1,11 @@
 config: # This is file 'patch/kernel/archive/rockchip64-6.8/0000.patching_config.yaml'
 
   # Just some info stuff; not used by the patching scripts
-  name: rockchip64-6.10
+  name: rockchip64-6.11
   kind: kernel
   type: mainline # or: vendor
-  branch: linux-6.10.y
-  last-known-good-tag: v6.10
+  branch: linux-6.11.y
+  last-known-good-tag: v6.11
   maintainers:
     - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini }
     - { github: paolosabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }

patch/kernel/archive/rockchip64-6.11/add-board-fine3399-dts.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lemon1151 <smile1151@foxmail.com>
-Date: Mon, 03 Jun 2024 12:32:02 +0200
+Date: Mon, 3 Jun 2024 12:32:02 +0200
 Subject: Adding support for the fine3399 board
 
 > X-Git-Archeology: - Revision 8f64f0508237888dd326018fa9a392346b8ec5ab: https://github.com/armbian/build/commit/8f64f0508237888dd326018fa9a392346b8ec5ab

patch/kernel/archive/rockchip64-6.11/add-board-xiaobao-nas-dts.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-Date: Wed, 29 May 2024 13:31:51 +0200
 From: Lemon <149338935+Lemon1151@users.noreply.github.com>
+Date: Wed, 29 May 2024 13:31:51 +0200
 Subject: Add board rk3399-xiaobao-nas
 
 > X-Git-Archeology: - Revision 10ce0c9e5f19728e76adc084c9424bc53ad1466e: https://github.com/armbian/build/commit/10ce0c9e5f19728e76adc084c9424bc53ad1466e

patch/kernel/archive/rockchip64-6.11/board-pbp-add-dp-alt-mode.patch

@@ -186,7 +186,7 @@ index 111111111111..222222222222 100644
  #include <linux/hrtimer.h>
  #include <linux/jiffies.h>
  #include <linux/kernel.h>
-@@ -551,6 +552,12 @@ struct tcpm_port {
+@@ -552,6 +553,12 @@ struct tcpm_port {
  	 */
  	unsigned int message_id_prime;
  	unsigned int rx_msgid_prime;
@@ -199,7 +199,7 @@ index 111111111111..222222222222 100644
  #ifdef CONFIG_DEBUG_FS
  	struct dentry *dentry;
  	struct mutex logbuffer_lock;	/* log buffer access lock */
-@@ -939,6 +946,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
+@@ -940,6 +947,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
  	port->ams = NONE_AMS;
  }
  
@@ -235,7 +235,7 @@ index 111111111111..222222222222 100644
  static int tcpm_pd_transmit(struct tcpm_port *port,
  			    enum tcpm_transmit_type tx_sop_type,
  			    const struct pd_message *msg)
-@@ -1178,6 +1214,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
+@@ -1179,6 +1215,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
  	typec_set_data_role(port->typec_port, data);
  	typec_set_pwr_role(port->typec_port, role);
  
@@ -244,7 +244,7 @@ index 111111111111..222222222222 100644
  	return 0;
  }
  
-@@ -1733,7 +1771,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
+@@ -1734,7 +1772,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
  		paltmode->mode = i;
  		paltmode->vdo = p[i];
  
@@ -253,7 +253,7 @@ index 111111111111..222222222222 100644
  			 pmdata->altmodes, paltmode->svid,
  			 paltmode->mode, paltmode->vdo);
  
-@@ -1757,6 +1795,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
+@@ -1758,6 +1796,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
  			tcpm_log(port, "Failed to register partner SVID 0x%04x",
  				 modep->altmode_desc[i].svid);
  			altmode = NULL;
@@ -262,7 +262,7 @@ index 111111111111..222222222222 100644
  		}
  		port->partner_altmode[i] = altmode;
  	}
-@@ -2133,11 +2173,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
+@@ -2134,11 +2174,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
  				modep->svid_index++;
  				if (modep->svid_index < modep->nsvids) {
  					u16 svid = modep->svids[modep->svid_index];
@@ -276,7 +276,7 @@ index 111111111111..222222222222 100644
  					*response_tx_sop_type = TCPC_TX_SOP_PRIME;
  					response[0] = VDO(USB_SID_PD, 1,
  							  typec_get_cable_svdm_version(typec),
-@@ -4344,6 +4386,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
+@@ -4346,6 +4388,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
  	port->cable = NULL;
  	if (port->connected) {
  		if (port->partner) {
@@ -284,7 +284,7 @@ index 111111111111..222222222222 100644
  			typec_partner_set_usb_power_delivery(port->partner, NULL);
  			typec_unregister_partner(port->partner);
  			port->partner = NULL;
-@@ -4438,6 +4481,8 @@ static void tcpm_detach(struct tcpm_port *port)
+@@ -4440,6 +4483,8 @@ static void tcpm_detach(struct tcpm_port *port)
  	}
  
  	tcpm_reset_port(port);
@@ -293,7 +293,7 @@ index 111111111111..222222222222 100644
  }
  
  static void tcpm_src_detach(struct tcpm_port *port)
-@@ -7028,6 +7073,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -7053,6 +7098,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
  	return ret;
  }
  
@@ -358,7 +358,7 @@ index 111111111111..222222222222 100644
  static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
  {
  	struct fwnode_handle *capabilities, *child, *caps = NULL;
-@@ -7041,6 +7144,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
+@@ -7066,6 +7169,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
  	if (!fwnode)
  		return -EINVAL;
  
@@ -382,7 +382,7 @@ index 111111111111..222222222222 100644
  	/*
  	 * This fwnode has a "compatible" property, but is never populated as a
  	 * struct device. Instead we simply parse it to read the properties.
-@@ -7591,6 +7711,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7616,6 +7736,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  		goto out_destroy_wq;
  
  	port->try_role = port->typec_caps.prefer_role;
@@ -400,7 +400,7 @@ index 111111111111..222222222222 100644
  
  	port->typec_caps.revision = 0x0120;	/* Type-C spec release 1.2 */
  	port->typec_caps.pd_revision = 0x0300;	/* USB-PD spec release 3.0 */
-@@ -7634,6 +7765,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7659,6 +7790,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  				      &tcpm_cable_ops);
  	port->registered = true;
  

patch/kernel/archive/rockchip64-6.11/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch

@@ -11,8 +11,8 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -557,6 +557,70 @@ saradc: saradc@ff1e0000 {
- 		status = "disabled";
+@@ -586,6 +586,70 @@ logic_leakage: logic-leakage@18 {
+ 		};
  	};
  
 +	thermal_zones: thermal-zones {

patch/kernel/archive/rockchip64-6.11/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch

@@ -14,7 +14,7 @@ diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/D
 index 111111111111..222222222222 100644
 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
 +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
-@@ -15,6 +15,7 @@ properties:
+@@ -17,6 +17,7 @@ properties:
        - rockchip,px30-tsadc
        - rockchip,rk3228-tsadc
        - rockchip,rk3288-tsadc

patch/kernel/archive/rockchip64-6.11/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -545,6 +545,15 @@ rktimer: rktimer@ff1a0000 {
+@@ -550,6 +550,15 @@ rktimer: rktimer@ff1a0000 {
  		clock-names = "pclk", "timer";
  	};
  

patch/kernel/archive/rockchip64-6.11/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch

@@ -67,7 +67,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -184,6 +184,26 @@ psci {
+@@ -155,6 +155,26 @@ psci {
  		method = "smc";
  	};
  

patch/kernel/archive/rockchip64-6.11/board-rocks0-0001-deviceTree.patch

@@ -0,0 +1,506 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brent Roman <genosenosor@gmail.com>
+Date: Wed, 7 Feb 2024 18:02:07 -0800
+Subject: Added Linux device tree for Rock S0
+
+Signed-off-by: Brent Roman <genosenosor@gmail.com>
+---
+ arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 346 ++++++----
+ 1 file changed, 200 insertions(+), 146 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+@@ -1,21 +1,17 @@
+ // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2019 Akash Gajjar <akash@openedev.com>
++ * Copyright (c) 2019 Jagan Teki <jagan@openedev.com>
++ * Revised: 2024 Brent Roman <brent@mbari.org>
++ */
+ 
+ /dts-v1/;
+-
+-#include <dt-bindings/leds/common.h>
+ #include "rk3308.dtsi"
+ 
+ / {
+ 	model = "Radxa ROCK S0";
+ 	compatible = "radxa,rock-s0", "rockchip,rk3308";
+ 
+-	aliases {
+-		ethernet0 = &gmac;
+-		mmc0 = &emmc;
+-		mmc1 = &sdmmc;
+-		mmc2 = &sdio;
+-	};
+-
+ 	chosen {
+ 		stdout-path = "serial0:1500000n8";
+ 	};
+@@ -23,38 +19,70 @@ chosen {
+ 	leds {
+ 		compatible = "gpio-leds";
+ 		pinctrl-names = "default";
+-		pinctrl-0 = <&pwr_led>;
++		pinctrl-0 = <&green_led_gio>;
+ 
+-		led-green {
+-			color = <LED_COLOR_ID_GREEN>;
+-			default-state = "on";
+-			function = LED_FUNCTION_HEARTBEAT;
++		green-led {
++			label = "rock-s0:green:power";
+ 			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
+ 			linux,default-trigger = "heartbeat";
++			default-state = "on";
+ 		};
+ 	};
+ 
+-	vdd_log: regulator-1v04-vdd-log {
+-		compatible = "regulator-fixed";
+-		regulator-name = "vdd_log";
+-		regulator-always-on;
+-		regulator-boot-on;
+-		regulator-min-microvolt = <1040000>;
+-		regulator-max-microvolt = <1040000>;
+-		vin-supply = <&vcc5v0_sys>;
++	acodec-sound {
++			compatible = "simple-audio-card";
++			simple-audio-card,format = "i2s";
++			simple-audio-card,name = "rockchip,rk3308-acodec";
++			simple-audio-card,mclk-fs = <256>;
++			simple-audio-card,codec-hp-det;
++			simple-audio-card,widgets =
++				"Headphone", "Headphones";
++			simple-audio-card,cpu {
++				sound-dai = <&i2s_8ch_2>;
++			};
++			simple-audio-card,codec {
++				sound-dai = <&codec>;
++			};
+ 	};
+ 
+-	vcc_ddr: regulator-1v5-vcc-ddr {
+-		compatible = "regulator-fixed";
+-		regulator-name = "vcc_ddr";
+-		regulator-always-on;
+-		regulator-boot-on;
+-		regulator-min-microvolt = <1500000>;
+-		regulator-max-microvolt = <1500000>;
+-		vin-supply = <&vcc5v0_sys>;
++	sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,format = "i2s";
++		simple-audio-card,mclk-fs = <256>;
++		simple-audio-card,name = "i2s_8ch_0";
++
++		simple-audio-card,dai-link@1 {
++			format = "i2s";
++			cpu {
++				sound-dai = <&i2s_8ch_0>;
++			};
++
++			codec {
++				sound-dai = <&pcm5102a>;
++			};
++		};
++	};
++
++	pcm5102a: pcm5102a {
++			#sound-dai-cells = <0>;
++			compatible = "ti,pcm5102a";
++			pcm510x,format = "i2s";
++	};
++
++	sdio_pwrseq: sdio-pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		pinctrl-0 = <&wifi_enable_h>;
++		pinctrl-names = "default";
++		/*
++		 * On the module itself this is one of these (depending
++		 * on the actual card populated):
++		 * - SDIO_RESET_L_WL_REG_ON
++		 * - PDN (power down when low)
++		 */
++		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
+ 	};
+ 
+-	vcc_1v8: regulator-1v8-vcc {
++	vcc_1v8: vcc-1v8 {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "vcc_1v8";
+ 		regulator-always-on;
+@@ -64,7 +92,7 @@ vcc_1v8: regulator-1v8-vcc {
+ 		vin-supply = <&vcc_io>;
+ 	};
+ 
+-	vcc_io: regulator-3v3-vcc-io {
++	vcc_io: vcc-io {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "vcc_io";
+ 		regulator-always-on;
+@@ -74,7 +102,28 @@ vcc_io: regulator-3v3-vcc-io {
+ 		vin-supply = <&vcc5v0_sys>;
+ 	};
+ 
+-	vcc5v0_sys: regulator-5v0-vcc-sys {
++	vcc_ddr: vcc-ddr {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc_ddr";
++		regulator-always-on;
++		regulator-boot-on;
++		regulator-min-microvolt = <1500000>;
++		regulator-max-microvolt = <1500000>;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
++	vcc5v0_otg: vcc5v0-otg {
++		compatible = "regulator-fixed";
++		enable-active-high;
++		gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&otg_vbus_drv>;
++		regulator-name = "vcc5v0_otg";
++		regulator-always-on;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
++	vcc5v0_sys: vcc5v0-sys {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "vcc5v0_sys";
+ 		regulator-always-on;
+@@ -83,119 +132,150 @@ vcc5v0_sys: regulator-5v0-vcc-sys {
+ 		regulator-max-microvolt = <5000000>;
+ 	};
+ 
+-	vdd_core: regulator-vdd-core {
++	vdd_core: vdd-core {
+ 		compatible = "pwm-regulator";
+ 		pwms = <&pwm0 0 5000 1>;
+ 		pwm-supply = <&vcc5v0_sys>;
+ 		regulator-name = "vdd_core";
+-		regulator-always-on;
+-		regulator-boot-on;
+ 		regulator-min-microvolt = <827000>;
+ 		regulator-max-microvolt = <1340000>;
++		regulator-init-microvolt = <1015000>;
+ 		regulator-settling-time-up-us = <250>;
++		regulator-always-on;
++		regulator-boot-on;
+ 	};
+ 
+-	sdio_pwrseq: sdio-pwrseq {
+-		compatible = "mmc-pwrseq-simple";
++	vdd_log: vdd-log {
++		compatible = "regulator-fixed";
++		regulator-name = "vdd_log";
++		regulator-always-on;
++		regulator-boot-on;
++		regulator-min-microvolt = <1050000>;
++		regulator-max-microvolt = <1050000>;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
++	board_antenna: board-antenna {
++		status = "okay";
++		compatible = "regulator-fixed";
++		enable-active-low;
++		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
++		regulator-always-on;
++		regulator-boot-on;
++		pinctrl-0 = <&ant_1>;
+ 		pinctrl-names = "default";
+-		pinctrl-0 = <&wifi_reg_on>;
+-		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
++		regulator-name = "board_antenna";
+ 	};
+ };
+ 
++&codec {
++	status = "okay";
++	#sound-dai-cells = <0>;
++};
++
+ &cpu0 {
+ 	cpu-supply = <&vdd_core>;
+ };
+ 
+ &emmc {
+ 	cap-mmc-highspeed;
+-	no-sd;
+-	no-sdio;
++	mmc-hs200-1_8v;
+ 	non-removable;
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_pwren>;
+-	vmmc-supply = <&vcc_io>;
++	vmmc-supply = <&vcc_io>;  //was vin-supply
++        status = "okay";
++};
++
++&sdmmc {
++	cap-mmc-highspeed;
++	cap-sd-highspeed;
++	disable-wp;
++	card-detect-delay = <800>;
+ 	status = "okay";
+ };
+ 
++&sdio {
++	#address-cells = <1>;
++	#size-cells = <0>;
++	cap-sd-highspeed;
++	cap-sdio-irq;
++	keep-power-in-suspend;
++	mmc-pwrseq = <&sdio_pwrseq>;
++	non-removable;
++	no-mmc;
++	status = "okay";
++
++	AP6212: wifi@1 {
++		compatible = "brcm,bcm4329-fmac";
++		reg = <1>;
++		interrupt-parent = <&gpio0>;
++		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
++		interrupt-names = "host-wake";
++		pinctrl-names = "default";
++		pinctrl-0 = <&wifi_host_wake>;
++	};
++};
++
+ &gmac {
+-	clock_in_out = "output";
+-	phy-handle = <&rtl8201f>;
+ 	phy-supply = <&vcc_io>;
++	clock_in_out = "output";
++	assigned-clocks = <&cru SCLK_MAC>;
++	assigned-clock-parents = <&cru SCLK_MAC_SRC>;
++	snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
++	snps,reset-active-low;
++	snps,reset-delays-us = <0 50000 50000>;
+ 	status = "okay";
++};
+ 
+-	mdio {
+-		compatible = "snps,dwmac-mdio";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-
+-		rtl8201f: ethernet-phy@1 {
+-			compatible = "ethernet-phy-ieee802.3-c22";
+-			reg = <1>;
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&mac_rst>;
+-			reset-assert-us = <20000>;
+-			reset-deassert-us = <50000>;
+-			reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
+-		};
+-	};
++&i2s_8ch_0 {
++	assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
++	assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;
++	rockchip,clk-trcm = <1>;
++	#sound-dai-cells = <0>;
+ };
+ 
+-&io_domains {
+-	vccio0-supply = <&vcc_io>;
+-	vccio1-supply = <&vcc_io>;
+-	vccio2-supply = <&vcc_io>;
+-	vccio3-supply = <&vcc_io>;
+-	vccio4-supply = <&vcc_1v8>;
+-	vccio5-supply = <&vcc_io>;
++&i2s_8ch_2 {
+ 	status = "okay";
++	#sound-dai-cells = <0>;
+ };
+ 
+ &pinctrl {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&rtc_32k>;
+ 
+-	bluetooth {
+-		bt_reg_on: bt-reg-on {
+-			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+-		};
+-
+-		bt_wake_host: bt-wake-host {
+-			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
+-		};
+-
+-		host_wake_bt: host-wake-bt {
+-			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
++	leds {
++		green_led_gio: green-led-gpio {
++			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 	};
+ 
+-	gmac {
+-		mac_rst: mac-rst {
+-			rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
++	usb {
++		otg_vbus_drv: otg-vbus-drv {
++			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 	};
+ 
+-	leds {
+-		pwr_led: pwr-led {
+-			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
++	sdio-pwrseq {
++		wifi_enable_h: wifi-enable-h {
++			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 	};
+ 
+ 	wifi {
+-		wifi_reg_on: wifi-reg-on {
+-			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
++		wifi_host_wake: wifi-host-wake {
++			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
+ 		};
+ 
+-		wifi_wake_host: wifi-wake-host {
+-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
++	};
++	antenna {
++		ant_1: ant-1 {
++			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
+ 		};
+ 	};
+ };
+ 
+ &pwm0 {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pwm0_pin_pull_down>;
+ 	status = "okay";
++	pinctrl-0 = <&pwm0_pin_pull_down>;
+ };
+ 
+ &saradc {
+@@ -203,91 +283,65 @@ &saradc {
+ 	status = "okay";
+ };
+ 
+-&sdio {
+-	#address-cells = <1>;
+-	#size-cells = <0>;
+-	cap-sd-highspeed;
+-	cap-sdio-irq;
+-	keep-power-in-suspend;
+-	max-frequency = <50000000>;
+-	mmc-pwrseq = <&sdio_pwrseq>;
+-	no-mmc;
+-	no-sd;
+-	non-removable;
+-	vmmc-supply = <&vcc_io>;
+-	vqmmc-supply = <&vcc_1v8>;
++&tsadc {
++	rockchip,hw-tshut-mode = <0>;		/* 0:CRU */
++	rockchip,hw-tshut-polarity = <1>;	/* 1:HIGH */
+ 	status = "okay";
+-
+-	brcmf: wifi@1 {
+-		compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";
+-		reg = <1>;
+-		interrupt-parent = <&gpio0>;
+-		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
+-		interrupt-names = "host-wake";
+-		pinctrl-names = "default";
+-		pinctrl-0 = <&wifi_wake_host>;
+-	};
+ };
+ 
+-&sdmmc {
+-	cap-mmc-highspeed;
+-	cap-sd-highspeed;
+-	disable-wp;
+-	vmmc-supply = <&vcc_io>;
++&i2c1 {
+ 	status = "okay";
+ };
+ 
+-&u2phy {
+-	status = "okay";
++&spi2 {
++//	status = "okay";  //conflicts with UART2
++	max-freq = <10000000>;
+ };
+ 
+-&u2phy_host {
++&uart0 {
+ 	status = "okay";
+ };
+ 
+-&u2phy_otg {
++&uart2 {
+ 	status = "okay";
+ };
+ 
+-&uart0 {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&uart0_xfer>;
++&uart4 {
+ 	status = "okay";
++
++	bluetooth {
++		compatible = "realtek,rtl8723bs-bt";
++		device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
++		host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
++	};
+ };
+ 
+-&uart4 {
+-	uart-has-rtscts;
++&u2phy {
+ 	status = "okay";
+ 
+-	bluetooth {
+-		compatible = "brcm,bcm43430a1-bt";
+-		clocks = <&cru SCLK_RTC32K>;
+-		clock-names = "lpo";
+-		interrupt-parent = <&gpio4>;
+-		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_HIGH>;
+-		interrupt-names = "host-wakeup";
+-		device-wakeup-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+-		shutdown-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+-		pinctrl-names = "default";
+-		pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
+-		vbat-supply = <&vcc_io>;
+-		vddio-supply = <&vcc_1v8>;
++	u2phy_host: host-port {
++		phy-supply = <&vcc5v0_otg>;
++		status = "okay";
++	};
++
++	u2phy_otg: otg-port {
++		status = "okay";
+ 	};
+ };
+ 
+-&usb_host_ehci {
++&usb20_otg {
+ 	status = "okay";
+ };
+ 
+-&usb_host_ohci {
++&usb_host_ehci {
+ 	status = "okay";
+ };
+ 
+-&usb20_otg {
+-	dr_mode = "peripheral";
++&usb_host_ohci{
+ 	status = "okay";
+ };
+ 
+ &wdt {
+ 	status = "okay";
+ };
++
+-- 
+Armbian
+

patch/kernel/archive/rockchip64-6.11/drv-spi-spidev-remove-warnings.patch

@@ -19,15 +19,15 @@ index 111111111111..222222222222 100644
 +	{ .name = "spi-dev" },
  	{ .name = "bh2228fv" },
  	{ .name = "dh2228fv" },
- 	{ .name = "ltc2488" },
-@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev)
+ 	{ .name = "jg10309-01" },
+@@ -730,6 +731,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 },
+ 	{ .compatible = "elgin,jg10309-01", .data = &spidev_of_check },
 -- 
 Armbian
 

patch/kernel/archive/rockchip64-6.11/general-add-miniDP-virtual-extcon.patch

@@ -319,13 +319,13 @@ index 000000000000..111111111111
 +	return 0;
 +}
 +
-+static int vpd_extcon_remove(struct platform_device *pdev)
++static void vpd_extcon_remove(struct platform_device *pdev)
 +{
 +	struct vpd_extcon *vpd = platform_get_drvdata(pdev);
 +
 +	cancel_delayed_work_sync(&vpd->irq_work);
 +
-+	return 0;
++	return;
 +}
 +
 +#ifdef CONFIG_PM_SLEEP

patch/kernel/archive/rockchip64-6.11/general-add-overlay-compilation-support.patch

@@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -394,15 +394,21 @@ quiet_cmd_wrap_S_dtb = WRAP    $@
+@@ -394,18 +394,24 @@ quiet_cmd_wrap_S_dtb = WRAP    $@
  		echo '.balign STRUCT_ALIGNMENT';					\
  	} > $@
  
@@ -52,13 +52,16 @@ index 111111111111..222222222222 100644
 +$(obj)/%.scr: $(src)/%.scr-cmd FORCE
 +	$(call if_changed,scr)
 +
- quiet_cmd_dtc = DTC     $@
+ quiet_dtb_check_tag = $(if $(dtb-check-enabled),[C],   )
+ cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true)
+ 
+ quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
  cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
 -	$(DTC) -o $@ -b 0 \
 +	$(DTC) -@ -o $@ -b 0 \
  		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
  		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
- 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
+ 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
 -- 
 Armbian
 

patch/kernel/archive/rockchip64-6.11/general-add-xtx-spi-nor-chips.patch

@@ -18,8 +18,8 @@ diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/Makefile
 +++ b/drivers/mtd/spi-nor/Makefile
-@@ -16,6 +16,7 @@ spi-nor-objs			+= winbond.o
- spi-nor-objs			+= xilinx.o
+@@ -15,6 +15,7 @@ spi-nor-objs			+= sst.o
+ spi-nor-objs			+= winbond.o
  spi-nor-objs			+= xmc.o
  spi-nor-$(CONFIG_DEBUG_FS)	+= debugfs.o
 +spi-nor-objs			+= xtx.o
@@ -30,9 +30,9 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -1988,6 +1988,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+@@ -1977,6 +1977,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+ 	&spi_nor_sst,
  	&spi_nor_winbond,
- 	&spi_nor_xilinx,
  	&spi_nor_xmc,
 +	&spi_nor_xtx,
  };
@@ -42,9 +42,9 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
-@@ -605,6 +605,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
+@@ -593,6 +593,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
+ extern const struct spi_nor_manufacturer spi_nor_sst;
  extern const struct spi_nor_manufacturer spi_nor_winbond;
- extern const struct spi_nor_manufacturer spi_nor_xilinx;
  extern const struct spi_nor_manufacturer spi_nor_xmc;
 +extern const struct spi_nor_manufacturer spi_nor_xtx;
  

patch/kernel/archive/rockchip64-6.11/general-disable-mtu-validation.patch

@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5863,27 +5863,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5864,27 +5864,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
  static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
  {
  	struct stmmac_priv *priv = netdev_priv(dev);

patch/kernel/archive/rockchip64-6.11/general-possibility-of-disabling-rk808-rtc.patch

@@ -25,7 +25,7 @@ diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
 index 111111111111..222222222222 100644
 --- a/drivers/mfd/mfd-core.c
 +++ b/drivers/mfd/mfd-core.c
-@@ -209,7 +209,7 @@ static int mfd_add_device(struct device *parent, int id,
+@@ -208,7 +208,7 @@ static int mfd_add_device(struct device *parent, int id,
  
  match:
  		if (!pdev->dev.of_node)