rockchip: bump edge kernel to 6.13-rc5

config/kernel/linux-rockchip-edge.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.12.6 Kernel Configuration
+# Linux/arm 6.13.0-rc5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -536,6 +536,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=m
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_SCMI_CPUFREQ=m
 # end of CPU Frequency scaling
@@ -757,6 +758,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+CONFIG_OF_PARTITION=y
 # end of Partition Types
 
 CONFIG_BLK_MQ_VIRTIO=y
@@ -1712,8 +1714,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_DEBUGFS=y
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=y
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
@@ -1848,7 +1848,6 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=m
 # ARM SCMI NXP i.MX Vendor Protocols
 #
 # CONFIG_IMX_SCMI_BBM_EXT is not set
-# CONFIG_IMX_SCMI_MISC_EXT is not set
 # end of ARM SCMI NXP i.MX Vendor Protocols
 
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
@@ -1858,6 +1857,7 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=m
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 
@@ -1983,12 +1983,6 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support
 
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -2143,6 +2137,7 @@ CONFIG_NET_DSA_MV88E6060=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON is not set
 CONFIG_NET_DSA_MV88E6XXX=m
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+# CONFIG_NET_DSA_MV88E6XXX_LEDS is not set
 # CONFIG_NET_DSA_MSCC_OCELOT_EXT is not set
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 # CONFIG_NET_DSA_AR9331 is not set
@@ -2268,6 +2263,7 @@ CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_MARVELL_88Q2XXX_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
+CONFIG_MTK_NET_PHYLIB=m
 CONFIG_MEDIATEK_GE_PHY=m
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_T1S_PHY is not set
@@ -2580,6 +2576,9 @@ CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723X=m
 CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
+CONFIG_RTW88_88XXA=m
+CONFIG_RTW88_8821A=m
+CONFIG_RTW88_8812A=m
 CONFIG_RTW88_8822BS=m
 CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CS=m
@@ -2589,6 +2588,8 @@ CONFIG_RTW88_8723DS=m
 CONFIG_RTW88_8723DU=m
 CONFIG_RTW88_8821CS=m
 CONFIG_RTW88_8821CU=m
+CONFIG_RTW88_8821AU=m
+CONFIG_RTW88_8812AU=m
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
 CONFIG_RTW89=m
@@ -2877,7 +2878,7 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 # CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F3A is not set
+CONFIG_RMI4_F3A=y
 # CONFIG_RMI4_F54 is not set
 # CONFIG_RMI4_F55 is not set
 
@@ -3195,6 +3196,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MPC8XXX is not set
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 CONFIG_GPIO_ROCKCHIP=y
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
@@ -3242,6 +3244,7 @@ CONFIG_GPIO_MAX77650=m
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders
 
 #
@@ -3411,6 +3414,7 @@ CONFIG_SENSORS_GPIO_FAN=y
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HS3001 is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set
@@ -3472,6 +3476,7 @@ CONFIG_SENSORS_GPIO_FAN=y
 # CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -4143,6 +4148,7 @@ CONFIG_VIDEO_MUX=m
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RP1_CFE is not set
 
 #
 # Renesas media platform drivers
@@ -4664,9 +4670,19 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+# end of Supported DRM clients
+
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
 CONFIG_DRM_BRIDGE_CONNECTOR=y
@@ -4703,6 +4719,7 @@ CONFIG_ROCKCHIP_VOP=y
 # CONFIG_ROCKCHIP_ANALOGIX_DP is not set
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
+# CONFIG_ROCKCHIP_DW_HDMI_QP is not set
 # CONFIG_ROCKCHIP_DW_MIPI_DSI is not set
 CONFIG_ROCKCHIP_INNO_HDMI=y
 # CONFIG_ROCKCHIP_LVDS is not set
@@ -4761,6 +4778,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
+# CONFIG_DRM_ITE_IT6263 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -4785,6 +4803,7 @@ CONFIG_DRM_SIMPLE_BRIDGE=m
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -4815,6 +4834,7 @@ CONFIG_DRM_SIMPLEDRM=m
 # CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_SHARP_MEMORY is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_PL111 is not set
@@ -4857,7 +4877,7 @@ CONFIG_FB_DMAMEM_HELPERS=y
 CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
-CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # end of Frame buffer Devices
@@ -5002,6 +5022,12 @@ CONFIG_SND_SOC_FSL_AUDMIX=m
 
 # CONFIG_SND_SOC_CHV3_I2S is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
+
+#
+# SoC Audio for Loongson CPUs
+#
+# end of SoC Audio for Loongson CPUs
+
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_ROCKCHIP=m
@@ -5013,6 +5039,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
 # CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
+CONFIG_SND_SOC_SDCA_OPTIONAL=m
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
 
 #
@@ -5032,6 +5059,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_ADAU1372_I2C is not set
 # CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1373 is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -5053,6 +5081,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW88081 is not set
 # CONFIG_SND_SOC_AW87390 is not set
 # CONFIG_SND_SOC_AW88399 is not set
 CONFIG_SND_SOC_BD28623=m
@@ -5076,6 +5105,7 @@ CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42L83 is not set
+# CONFIG_SND_SOC_CS42L84 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -5095,6 +5125,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES7241=m
 # CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8323 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
@@ -5148,6 +5179,7 @@ CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SMA1303 is not set
+# CONFIG_SND_SOC_SMA1307 is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SRC4XXX_I2C is not set
 CONFIG_SND_SOC_SSM2305=m
@@ -5186,6 +5218,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 CONFIG_SND_SOC_TSCS454=m
 CONFIG_SND_SOC_UDA1334=m
+# CONFIG_SND_SOC_UDA1342 is not set
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
@@ -5224,6 +5257,8 @@ CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_NTP8918 is not set
+# CONFIG_SND_SOC_NTP8835 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
@@ -5289,6 +5324,7 @@ CONFIG_HOLTEK_FF=y
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+# CONFIG_HID_KYSONA is not set
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
@@ -6032,10 +6068,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-# CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-# CONFIG_VT6656 is not set
 
 #
 # IIO staging drivers
@@ -6082,7 +6115,6 @@ CONFIG_VIDEO_ROCKCHIP_VDEC=m
 # StarFive media platform drivers
 #
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
-# CONFIG_LTE_GDM724X is not set
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -6117,10 +6149,7 @@ CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 # CONFIG_MOST_COMPONENTS is not set
 # CONFIG_XIL_AXIS_FIFO is not set
-CONFIG_FIELDBUS_DEV=m
-CONFIG_HMS_ANYBUSS_BUS=m
-CONFIG_ARCX_ANYBUS_CONTROLLER=m
-CONFIG_HMS_PROFINET=m
+# CONFIG_GPIB is not set
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -6206,6 +6235,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
+CONFIG_IOMMUFD_DRIVER_CORE=m
 CONFIG_IOMMUFD=m
 CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_ARM_SMMU is not set
@@ -6432,8 +6462,10 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_AD7606=m
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 CONFIG_AD7606_IFACE_SPI=m
+# CONFIG_AD7625 is not set
 # CONFIG_AD7766 is not set
 CONFIG_AD7768_1=m
+# CONFIG_AD7779 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -6446,6 +6478,7 @@ CONFIG_AD7768_1=m
 # CONFIG_CC10001_ADC is not set
 # CONFIG_CPCAP_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_GEHC_PMC_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -6570,6 +6603,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R_HS is not set
 # CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
@@ -6595,6 +6629,7 @@ CONFIG_AD5758=m
 # CONFIG_AD5791 is not set
 # CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -6707,6 +6742,8 @@ CONFIG_ADIS16460=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
+# CONFIG_BMI270_I2C is not set
+# CONFIG_BMI270_SPI is not set
 # CONFIG_BMI323_I2C is not set
 # CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
@@ -6718,6 +6755,7 @@ CONFIG_ADIS16460=m
 # CONFIG_INV_ICM42600_SPI is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_SMI240 is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
 # CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
@@ -6780,6 +6818,7 @@ CONFIG_TSL2772=m
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
+# CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
@@ -6795,6 +6834,7 @@ CONFIG_TSL2772=m
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_ALS31300 is not set
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
@@ -6975,6 +7015,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_CAN_TRANSCEIVER=m
+# CONFIG_PHY_NXP_PTN3222 is not set
 
 #
 # PHY drivers for Broadcom platforms
@@ -7108,10 +7149,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
 CONFIG_JFS_FS=m
 # CONFIG_JFS_POSIX_ACL is not set
 # CONFIG_JFS_SECURITY is not set
@@ -7139,6 +7176,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=y
@@ -7906,6 +7944,8 @@ CONFIG_SBITMAP=y
 # end of Library routines
 
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y
+CONFIG_MIN_HEAP=y
 
 #
 # Kernel hacking
@@ -7974,6 +8014,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
 # CONFIG_DEBUG_NET is not set
+# CONFIG_DEBUG_NET_SMALL_RTNL is not set
 # end of Networking Debugging
 
 #

config/sources/families/rockchip.conf

@@ -51,12 +51,12 @@ case $BRANCH in
 
 	current)
 
-		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
 		;;
 
 	edge)
 
-		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
 		;;
 
 esac

lib/functions/compilation/patch/drivers_network.sh

@@ -605,6 +605,10 @@ driver_rtl8723cs() {
 		process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Port-to-6.9.patch" "applying"
 	fi
 
+	if linux-version compare "${version}" ge 6.13; then
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Port-to-6.13.patch" "applying"
+	fi
+
 }
 
 ###  The vendor's RTL8723DS driver is still required for RockPI-S support because

patch/kernel/archive/rockchip-6.13/0000.patching_config.yaml

@@ -1,10 +1,10 @@
 config:
   # Just some info stuff; not used by the patching scripts
-  name: rockchip-6.6
+  name: rockchip-6.13
   kind: kernel
   type: mainline # or: vendor
-  branch: linux-6.6.y
-  last-known-good-tag: v6.6.10
+  branch: linux-6.13.y
+  last-known-good-tag: v6.13-rc5
   maintainers:
     - { github: paolo.sabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }
 

patch/kernel/archive/rockchip-6.13/armbian.series

@@ -29,6 +29,7 @@
 	patches.armbian/general-add-overlay-compilation-support.patch
 	patches.armbian/general-add-overlay-configfs.patch
 	patches.armbian/general-add-restart-handler-for-act8846.patch
+	patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch
 	patches.armbian/general-dwc2-fix-wait-peripheral.patch
 	patches.armbian/general-dwc2-fix-wait-time.patch
 	patches.armbian/general-dwc2-nak-gadget.patch

patch/kernel/archive/rockchip-6.13/kernel-6.8-tools-cgroup-makefile.patch

@@ -0,0 +1,17 @@
+diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
+new file mode 100644
+index 000000000000..ffca068e4a76
+--- /dev/null
++++ b/tools/cgroup/Makefile
+@@ -0,0 +1,11 @@
++# SPDX-License-Identifier: GPL-2.0
++# Makefile for cgroup tools
++
++CFLAGS = -Wall -Wextra
++
++all: cgroup_event_listener
++%: %.c
++	$(CC) $(CFLAGS) -o $@ $^
++
++clean:
++	$(RM) cgroup_event_listener

patch/kernel/archive/rockchip-6.13/libreelec.series

@@ -1,10 +1,8 @@
 # Series from patches.libreelec/
 	patches.libreelec/linux-0002-rockchip-from-list.patch
 	patches.libreelec/linux-0011-v4l2-from-list.patch
-	patches.libreelec/linux-0020-drm-from-list.patch
 	patches.libreelec/linux-1000-drm-rockchip.patch
 	patches.libreelec/linux-1001-v4l2-rockchip.patch
 	patches.libreelec/linux-1002-for-libreelec.patch
-	patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch
 	patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch
 	patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch

patch/kernel/archive/rockchip-6.13/overlay/Makefile

@@ -3,9 +3,9 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rockchip-ds1307.dtbo    \
 	rockchip-i2c1.dtbo      \
 	rockchip-i2c4.dtbo      \
-	rockchip-pwm1.dtbo      \
-	rockchip-pwm2.dtbo      \
-	rockchip-pwm3.dtbo      \
+	rockchip-pwm1.dtbo	\
+	rockchip-pwm2.dtbo	\
+	rockchip-pwm3.dtbo	\
 	rockchip-spi0.dtbo      \
 	rockchip-spi2.dtbo      \
 	rockchip-spidev0.dtbo   \
@@ -51,8 +51,7 @@ dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \
        README.rk322x-overlays \
        README.rockchip-overlays
 
-targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
+dtb-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)
 
-always         := $(dtbo-y) $(scr-y) $(dtbotxt-y)
 clean-files    := *.dtbo *.scr
 

patch/kernel/archive/rockchip-6.13/patches.armbian/driver-rk322x-audio-codec.patch

@@ -1,25 +1,25 @@
-From b4f40590a4f946d8ee704faf8579930e53ef4650 Mon Sep 17 00:00:00 2001
+From 50a8db983c682918cd2efe02ede48db93892d52a Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sun, 12 Sep 2021 10:15:56 +0000
-Subject: [PATCH] rk322x: analog audio codec
+Date: Sat, 20 Jul 2024 13:51:55 +0200
+Subject: [PATCH] rk3228: add analog audio codec
 
 ---
  .../bindings/sound/rockchip,rk3228-codec.txt  |  22 +
- arch/arm/boot/dts/rockchip/rk322x.dtsi                 |   9 +
+ arch/arm/boot/dts/rockchip/rk322x.dtsi        |   9 +
  drivers/clk/rockchip/clk-rk3228.c             |   2 +-
  include/dt-bindings/clock/rk3228-cru.h        |   1 +
- sound/soc/codecs/Kconfig                      |   5 +
+ sound/soc/codecs/Kconfig                      |   6 +
  sound/soc/codecs/Makefile                     |   2 +
  sound/soc/codecs/rk3228_codec.c               | 545 ++++++++++++++++++
  sound/soc/codecs/rk3228_codec.h               | 218 +++++++
- 8 files changed, 803 insertions(+), 1 deletion(-)
+ 8 files changed, 804 insertions(+), 1 deletion(-)
  create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
  create mode 100644 sound/soc/codecs/rk3228_codec.c
  create mode 100644 sound/soc/codecs/rk3228_codec.h
 
 diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
 new file mode 100644
-index 000000000..9191a8593
+index 000000000000..9191a8593380
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
 @@ -0,0 +1,22 @@
@@ -46,10 +46,10 @@ index 000000000..9191a8593
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi
-index 75af99c76..c2670d498 100644
+index cc5a5e609f04..d13dc979a67e 100644
 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
-@@ -145,6 +145,15 @@ i2s1: i2s1@100b0000 {
+@@ -249,6 +249,15 @@ i2s1: i2s1@100b0000 {
  		status = "disabled";
  	};
  
@@ -66,10 +66,10 @@ index 75af99c76..c2670d498 100644
  		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
  		reg = <0x100c0000 0x4000>;
 diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
-index a24a35553..69f8c792f 100644
+index 0db8a97007f2..0f690dd84650 100644
 --- a/drivers/clk/rockchip/clk-rk3228.c
 +++ b/drivers/clk/rockchip/clk-rk3228.c
-@@ -620,7 +620,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
+@@ -603,7 +603,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
  	GATE(0, "pclk_sim", "pclk_cpu", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS),
  
  	GATE(0, "pclk_ddrphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS),
@@ -79,10 +79,10 @@ index a24a35553..69f8c792f 100644
  	GATE(0, "pclk_vdacphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 8, GFLAGS),
  	GATE(0, "pclk_phy_noc", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS),
 diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h
-index de550ea56..30d44ce90 100644
+index 911824731866..9162f9132657 100644
 --- a/include/dt-bindings/clock/rk3228-cru.h
 +++ b/include/dt-bindings/clock/rk3228-cru.h
-@@ -115,6 +115,7 @@
+@@ -116,6 +116,7 @@
  #define PCLK_HDMI_CTRL		364
  #define PCLK_HDMI_PHY		365
  #define PCLK_GMAC		367
@@ -91,51 +91,52 @@ index de550ea56..30d44ce90 100644
  /* hclk gates */
  #define HCLK_I2S0_8CH		442
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 07747565c3b5..0a05315786bc 100644
+index 4afc43d3f71f..183a69249160 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
-@@ -168,6 +168,7 @@ config SND_SOC_ALL_CODECS
- 	imply SND_SOC_PCM512x_I2C
- 	imply SND_SOC_PCM512x_SPI
+@@ -182,6 +182,7 @@ config SND_SOC_ALL_CODECS
+ 	imply SND_SOC_PCM6240
  	imply SND_SOC_PEB2466
+ 	imply SND_SOC_RK3308
 +	imply SND_SOC_RK3228
  	imply SND_SOC_RK3328
  	imply SND_SOC_RK817
  	imply SND_SOC_RT274
-@@ -1251,6 +1252,10 @@ config SND_SOC_PEB2466
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called snd-soc-peb2466.
+@@ -1457,6 +1458,11 @@ config SND_SOC_RK3308
+ 	  It has 8 24-bit ADCs and 2 24-bit DACs. The maximum supported
+ 	  sampling rate is 192 kHz.
  
 +config SND_SOC_RK3228
++	tristate "Rockchip RK3228 audio CODEC"
++	depends on ARCH_ROCKCHIP || COMPILE_TEST
 +	select REGMAP_MMIO
-+	tristate "Rockchip RK3228 CODEC"
 +
  config SND_SOC_RK3328
  	tristate "Rockchip RK3328 audio CODEC"
- 	select REGMAP_MMIO
+ 	depends on ARCH_ROCKCHIP || COMPILE_TEST
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index f1ca18f7946c..73d3f6ffd7be 100644
+index b4df22186e25..454179eb7b73 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
-@@ -188,6 +188,7 @@ snd-soc-pcm512x-objs := pcm512x.o
- snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
- snd-soc-pcm512x-spi-objs := pcm512x-spi.o
- snd-soc-peb2466-objs := peb2466.o
-+snd-soc-rk3228-objs := rk3228_codec.o
- snd-soc-rk3328-objs := rk3328_codec.o
- snd-soc-rk817-objs := rk817_codec.o
- snd-soc-rl6231-objs := rl6231.o
-@@ -550,6 +551,7 @@ obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
- obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
- obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
+@@ -207,6 +207,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o
+ snd-soc-pcm6240-y := pcm6240.o
+ snd-soc-peb2466-y := peb2466.o
+ snd-soc-rk3308-y := rk3308_codec.o
++snd-soc-rk3228-y := rk3228_codec.o
+ snd-soc-rk3328-y := rk3328_codec.o
+ snd-soc-rk817-y := rk817_codec.o
+ snd-soc-rl6231-y := rl6231.o
+@@ -599,6 +600,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
+ obj-$(CONFIG_SND_SOC_PCM6240)	+= snd-soc-pcm6240.o
  obj-$(CONFIG_SND_SOC_PEB2466)	+= snd-soc-peb2466.o
+ obj-$(CONFIG_SND_SOC_RK3308)	+= snd-soc-rk3308.o
 +obj-$(CONFIG_SND_SOC_RK3228)	+= snd-soc-rk3228.o
  obj-$(CONFIG_SND_SOC_RK3328)	+= snd-soc-rk3328.o
  obj-$(CONFIG_SND_SOC_RK817)	+= snd-soc-rk817.o
  obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o
 diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c
 new file mode 100644
-index 000000000..b65307435
+index 000000000000..197e7e2e0d8b
 --- /dev/null
 +++ b/sound/soc/codecs/rk3228_codec.c
 @@ -0,0 +1,545 @@
@@ -655,7 +656,7 @@ index 000000000..b65307435
 +	return ret;
 +}
 +
-+static int rk3228_platform_remove(struct platform_device *pdev)
++static void rk3228_platform_remove(struct platform_device *pdev)
 +{
 +	struct rk3228_codec_priv *rk3228 = platform_get_drvdata(pdev);
 +
@@ -668,7 +669,7 @@ index 000000000..b65307435
 +	if (!IS_ERR(rk3228->sclk))
 +		clk_disable_unprepare(rk3228->sclk);
 +
-+	return 0;
++	return;
 +}
 +
 +static struct platform_driver rk3228_codec_driver = {
@@ -686,7 +687,7 @@ index 000000000..b65307435
 +MODULE_LICENSE("GPL v2");
 diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h
 new file mode 100644
-index 000000000..7283d0ba8
+index 000000000000..7283d0ba86e8
 --- /dev/null
 +++ b/sound/soc/codecs/rk3228_codec.h
 @@ -0,0 +1,218 @@
@@ -909,6 +910,5 @@ index 000000000..7283d0ba8
 +
 +#endif
 -- 
-2.25.1
-
+2.34.1
 

patch/kernel/archive/rockchip-6.13/patches.armbian/driver-rk3288-gpiomem.patch

@@ -349,7 +349,7 @@ index 0000000..984471c
 +	return err;
 +}
 +
-+static int rk3288_gpiomem_remove(struct platform_device *pdev)
++static void rk3288_gpiomem_remove(struct platform_device *pdev)
 +{
 +	struct device *dev = inst->dev;
 +
@@ -360,7 +360,7 @@ index 0000000..984471c
 +	unregister_chrdev_region(rk3288_gpiomem_devid, 1);
 +
 +	dev_info(dev, "GPIO mem driver removed - OK");
-+	return 0;
++	return;
 +}
 +
 + /****************************************************************************

patch/kernel/archive/rockchip-6.13/patches.armbian/drm-rockchip-hardware-cursor.patch

@@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockc
 index 83a926c0a..b0832320e 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1160,6 +1160,207 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane,
+@@ -1160,6 +1160,197 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane,
  	}
  }
  
@@ -28,10 +28,8 @@ index 83a926c0a..b0832320e 100644
 +	const struct vop_win_data *win = vop_win->data;
 +	struct vop *vop = to_vop(new_state->crtc);
 +	struct drm_framebuffer *fb = new_state->fb;
-+	unsigned int actual_w, actual_h;
 +	unsigned int dsp_stx, dsp_sty;
 +	uint32_t dsp_st;
-+	struct drm_rect *src = &new_state->src;
 +	struct drm_rect *dest = &new_state->dst;
 +	struct drm_gem_object *obj;
 +	struct rockchip_gem_object *rk_obj;
@@ -58,8 +56,6 @@ index 83a926c0a..b0832320e 100644
 +	obj = fb->obj[0];
 +	rk_obj = to_rockchip_obj(obj);
 +
-+// 	actual_w = drm_rect_width(src) >> 16;
-+// 	actual_h = drm_rect_height(src) >> 16;
 +
 +	dsp_stx = dest->x1 + crtc->mode.htotal - crtc->mode.hsync_start;
 +	dsp_sty = dest->y1 + crtc->mode.vtotal - crtc->mode.vsync_start;
@@ -71,8 +67,6 @@ index 83a926c0a..b0832320e 100644
 +	 * For y-mirroring we need to move address
 +	 * to the beginning of the last line.
 +	 */
-+// 	if (new_state->rotation & DRM_MODE_REFLECT_Y)
-+// 		dma_addr += (actual_h - 1) * fb->pitches[0];
 +
 +	spin_lock(&vop->reg_lock);
 +
@@ -82,10 +76,6 @@ index 83a926c0a..b0832320e 100644
 +
 +		VOP_WIN_SET(vop, win, format, format);
 +
-+// 		if (win->phy->scl)
-+// 			scl_vop_cal_scl_fac(vop, win, actual_w, actual_h,
-+// 					drm_rect_width(dest), drm_rect_height(dest),
-+// 					fb->format);
 +
 +		rb_swap = has_rb_swapped(vop->data->version, fb->format->format);
 +		VOP_WIN_SET(vop, win, rb_swap, rb_swap);

patch/kernel/archive/rockchip-6.13/patches.armbian/general-add-overlay-compilation-support.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <paolo.sabatino@gmail.com>
+Date: Wed, 2 Oct 2024 19:30:34 +0300
+Subject: compile .scr and install overlays in right path
+
+---
+ scripts/Makefile.dtbinst | 13 +++++++++-
+ scripts/Makefile.dtbs    |  8 +++++-
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
+index 111111111111..222222222222 100644
+--- a/scripts/Makefile.dtbinst
++++ b/scripts/Makefile.dtbinst
+@@ -33,7 +33,18 @@ endef
+ 
+ $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
+ 
+-dtbs := $(notdir $(dtbs))
++# Very convoluted way to flatten all the device tree
++# directories, but keep the "/overlay/" directory
++
++# topmost directory (ie: from rockchip/overlay/rk322x-emmc.dtbo extracts rockchip)
++topmost_dir = $(firstword $(subst /, ,$(dtbs)))
++# collect dtbs entries which starts with "$topmost_dir/overlay/", then remove "$topmost_dir"
++dtbs_overlays = $(subst $(topmost_dir)/,,$(filter $(topmost_dir)/overlay/%, $(dtbs)))
++# collect the non-overlay dtbs
++dtbs_regular = $(filter-out $(topmost_dir)/overlay/%, $(dtbs))
++# compose the dtbs variable flattening all the non-overlays entries
++# and appending the overlays entries
++dtbs := $(notdir $(dtbs_regular)) $(dtbs_overlays)
+ 
+ endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
+ 
+diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
+index 111111111111..222222222222 100644
+--- a/scripts/Makefile.dtbs
++++ b/scripts/Makefile.dtbs
+@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+ 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 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
++	$(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) \
+ 	$(cmd_dtb_check)
+ 
++quiet_cmd_scr = MKIMAGE $@
++cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
++
+ $(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+ 	$(call if_changed_dep,dtc)
+ 
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ 	$(call if_changed_dep,dtc)
+ 
++$(obj)/%.scr: $(src)/%.scr-cmd FORCE
++	$(call if_changed,scr)
++
+ # targets
+ # ---------------------------------------------------------------------------
+ 
+-- 
+Armbian
+

patch/kernel/archive/rockchip-6.13/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch

@@ -0,0 +1,24 @@
+From c046bcccf1ca331cff3b89f09eed080a5407aa5a Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <paolo.sabatino@gmail.com>
+Date: Wed, 4 Dec 2024 14:32:40 +0100
+Subject: [PATCH] rockchip: fix rk3288 reset-on-wake quirk
+
+---
+ drivers/usb/dwc2/params.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
+index 4d73fae80b12..0109055a9a8e 100644
+--- a/drivers/usb/dwc2/params.c
++++ b/drivers/usb/dwc2/params.c
+@@ -130,7 +130,6 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
+ 	p->lpm_clock_gating = false;
+ 	p->besl = false;
+ 	p->hird_threshold_en = false;
+-	p->no_clock_gating = true;
+ }
+ 
+ static void dwc2_set_ltq_danube_params(struct dwc2_hsotg *hsotg)
+-- 
+2.43.0
+