Adjust the armbian test kernel branch

.github/workflows/compile-release-rk3588-kernel.yml

@@ -18,7 +18,7 @@ on:
         options:
           - unifreq/linux-5.10.y-rk35xx
           - codesnas/linux-5.10.y-rk35xx
-          - armbian/linux-rockchip@rk-6.1-rkr3
+          - armbian/linux-rockchip@rk-6.1-rkr4.1
       kernel_version:
         description: "Select kernel version"
         required: false

.github/workflows/compile-release-rk35xx-kernel.yml

@@ -18,7 +18,7 @@ on:
         options:
           - unifreq/linux-5.10.y-rk35xx
           - codesnas/linux-5.10.y-rk35xx
-          - armbian/linux-rockchip@rk-6.1-rkr3
+          - armbian/linux-rockchip@rk-6.1-rkr4.1
       kernel_version:
         description: "Select kernel version"
         required: false

kernel-config/release/rk3588/config-6.1

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.75 Kernel Configuration
+# Linux/arm64 6.1.84 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.3.Rel1 (Build arm-13.24)) 13.3.1 20240614"
 CONFIG_CC_IS_GCC=y
@@ -163,7 +163,7 @@ CONFIG_UCLAMP_BUCKETS_COUNT=20
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
@@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_ERRATUM_2457168=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -1540,10 +1541,8 @@ CONFIG_NET_SCHED=y
 #
 # Queueing/Scheduling
 #
-CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
@@ -1555,7 +1554,6 @@ CONFIG_NET_SCH_TBF=m
 # CONFIG_NET_SCH_ETF is not set
 # CONFIG_NET_SCH_TAPRIO is not set
 CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
@@ -2568,9 +2566,6 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HUAWEI=y
 # CONFIG_HINIC is not set
 # CONFIG_NET_VENDOR_INTEL is not set
-CONFIG_NET_VENDOR_WANGXUN=y
-# CONFIG_NGBE is not set
-# CONFIG_TXGBE is not set
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_ADI=y
 # CONFIG_ADIN1110 is not set
@@ -2641,6 +2636,9 @@ CONFIG_DWMAC_ROCKCHIP_TOOL=y
 CONFIG_NET_VENDOR_VERTEXCOM=y
 # CONFIG_MSE102X is not set
 # CONFIG_NET_VENDOR_VIA is not set
+CONFIG_NET_VENDOR_WANGXUN=y
+# CONFIG_NGBE is not set
+# CONFIG_TXGBE is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_EMACLITE is not set
@@ -2736,6 +2734,7 @@ CONFIG_CAN_M_CAN=m
 # CONFIG_CAN_PEAK_PCIEFD is not set
 # CONFIG_CAN_ROCKCHIP is not set
 # CONFIG_CANFD_ROCKCHIP is not set
+# CONFIG_CAN_RK3562 is not set
 # CONFIG_CANFD_RK3576 is not set
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
@@ -3776,6 +3775,7 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_ROCKCHIP_MISCDEV=y
 # CONFIG_SPI_ROCKCHIP_FLEXBUS_FSPI is not set
+# CONFIG_SPI_ROCKCHIP_FLEXBUS_SPI is not set
 CONFIG_SPI_ROCKCHIP_SFC=y
 CONFIG_SPI_ROCKCHIP_SLAVE=y
 # CONFIG_SPI_SC18IS602 is not set
@@ -4460,7 +4460,6 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
@@ -4557,6 +4556,7 @@ CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_QCOM_SPMI is not set
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RK801 is not set
 CONFIG_REGULATOR_RK806=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_RK860X=y
@@ -4919,6 +4919,7 @@ CONFIG_ROCKCHIP_CIF_WORKMODE_PINGPONG=y
 CONFIG_ROCKCHIP_CIF_USE_DUMMY_BUF=y
 # CONFIG_ROCKCHIP_CIF_USE_NONE_DUMMY_BUF is not set
 # CONFIG_ROCKCHIP_CIF_USE_MONITOR is not set
+# CONFIG_ROCKCHIP_FLEXBUS_CIF is not set
 CONFIG_VIDEO_ROCKCHIP_RKISP1=y
 CONFIG_VIDEO_ROCKCHIP_ISP=y
 CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V1X=y
@@ -5187,6 +5188,7 @@ CONFIG_VIDEO_DW9768=m
 CONFIG_VIDEO_DW9800W=m
 CONFIG_VIDEO_DW9807_VCM=m
 CONFIG_VIDEO_FP5510=m
+CONFIG_VIDEO_VM149C=m
 # end of Lens drivers
 
 #
@@ -5824,6 +5826,7 @@ CONFIG_MALI_BIFROST=y
 CONFIG_MALI_PLATFORM_NAME="rk"
 CONFIG_MALI_REAL_HW=y
 # CONFIG_MALI_BIFROST_NO_MALI is not set
+# CONFIG_MALI_IS_FPGA is not set
 
 #
 # Platform specific options
@@ -5834,17 +5837,13 @@ CONFIG_MALI_CSF_SUPPORT=y
 CONFIG_MALI_BIFROST_DEVFREQ=y
 CONFIG_MALI_BIFROST_GATOR_SUPPORT=y
 CONFIG_MALI_BIFROST_ENABLE_TRACE=y
+# CONFIG_MALI_ARBITER_SUPPORT is not set
 # CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND is not set
 # CONFIG_MALI_DMA_BUF_LEGACY_COMPAT is not set
 # CONFIG_MALI_CORESIGHT is not set
 CONFIG_MALI_BIFROST_EXPERT=y
-# CONFIG_LARGE_PAGE_ALLOC_OVERRIDE is not set
-# CONFIG_LARGE_PAGE_ALLOC is not set
-# CONFIG_MALI_MEMORY_FULLY_BACKED is not set
-
-#
-# Platform options
-#
+CONFIG_LARGE_PAGE_SUPPORT=y
+CONFIG_PAGE_MIGRATION_SUPPORT=y
 
 #
 # Debug options
@@ -5859,7 +5858,6 @@ CONFIG_MALI_BIFROST_SYSTEM_TRACE=y
 CONFIG_MALI_PRFCNT_SET_PRIMARY=y
 # CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY is not set
 # CONFIG_MALI_PRFCNT_SET_TERTIARY is not set
-# CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS is not set
 # CONFIG_MALI_JOB_DUMP is not set
 
 #
@@ -5868,6 +5866,8 @@ CONFIG_MALI_PRFCNT_SET_PRIMARY=y
 # CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED is not set
 # CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE is not set
 # CONFIG_MALI_ARBITRATION is not set
+CONFIG_MALI_TRACE_POWER_GPU_WORK_PERIOD=y
+CONFIG_MALI_CSF_INCLUDE_FW=y
 
 #
 # Frame buffer Devices
@@ -6090,6 +6090,7 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_DYNAMIC_DMA_CHAN is not set
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_AMD_ACP_CONFIG is not set
@@ -6119,7 +6120,9 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 CONFIG_SND_SOC_ROCKCHIP=y
+# CONFIG_SND_SOC_ROCKCHIP_ASRC is not set
 # CONFIG_SND_SOC_ROCKCHIP_DLP_PCM is not set
+# CONFIG_SND_SOC_ROCKCHIP_DUMMY_DAI is not set
 CONFIG_SND_SOC_ROCKCHIP_I2S=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
 # CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES is not set
@@ -6254,6 +6257,7 @@ CONFIG_SND_SOC_MAX98090=y
 # CONFIG_SND_SOC_RK3228 is not set
 CONFIG_SND_SOC_RK3308=y
 CONFIG_SND_SOC_RK3328=y
+# CONFIG_SND_SOC_RK3506 is not set
 CONFIG_SND_SOC_RK3528=y
 # CONFIG_SND_SOC_RK730 is not set
 CONFIG_SND_SOC_RK817=y
@@ -7368,6 +7372,7 @@ CONFIG_ROCKCHIP_CLK_BOOST=y
 CONFIG_ROCKCHIP_CLK_INV=y
 CONFIG_ROCKCHIP_CLK_OUT=y
 CONFIG_ROCKCHIP_CLK_PVTM=y
+# CONFIG_ROCKCHIP_CLK_PVTPLL is not set
 CONFIG_ROCKCHIP_DDRCLK=y
 CONFIG_ROCKCHIP_DDRCLK_SIP=y
 CONFIG_ROCKCHIP_DDRCLK_SIP_V2=y
@@ -7501,6 +7506,7 @@ CONFIG_CPU_RK1808=y
 CONFIG_CPU_RK3328=y
 # CONFIG_CPU_RK3368 is not set
 CONFIG_CPU_RK3399=y
+# CONFIG_CPU_RK3506 is not set
 CONFIG_CPU_RK3528=y
 # CONFIG_CPU_RK3562 is not set
 CONFIG_CPU_RK3568=y
@@ -7715,6 +7721,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
 # CONFIG_QCOM_SPMI_ADC5 is not set
+# CONFIG_ROCKCHIP_FLEXBUS_ADC is not set
 CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_ROCKCHIP_SARADC_TEST_CHN is not set
 # CONFIG_RICHTEK_RTQ6056 is not set
@@ -7844,6 +7851,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
+# CONFIG_ROCKCHIP_FLEXBUS_DAC is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
 # CONFIG_TI_DAC7311 is not set
@@ -8246,6 +8254,7 @@ CONFIG_ARM_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_HISI_PCIE_PMU is not set
 # CONFIG_HNS3_PMU is not set
+# CONFIG_DWC_PCIE_PMU is not set
 # end of Performance monitor support
 
 # CONFIG_RAS is not set
@@ -8566,7 +8575,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 # CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 # CONFIG_NFSD_BLOCKLAYOUT is not set