Skip to content

Commit fa9302f

Browse files
rockchip64: bump edge to 6.16-rc3 (#8328)
* Fix wifi drivers on kernel v6.16 These patches can get deleted after merged upstream. * initial commit * fix header * remove ssv6051 driver --------- Co-authored-by: amazingfate <[email protected]>
1 parent 530fbc8 commit fa9302f

File tree

274 files changed

+784
-50492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+784
-50492
lines changed

config/sources/families/include/rockchip64_common.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ case $BRANCH in
3333
;;
3434

3535
edge)
36-
declare -g KERNEL_MAJOR_MINOR="6.15"
36+
declare -g KERNEL_MAJOR_MINOR="6.16"
3737
declare -g LINUXFAMILY=rockchip64
3838
declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
3939
;;

config/sources/mainline-kernel.conf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
function mainline_kernel_decide_version__upstream_release_candidate_number() {
99
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
1010
if [[ "${KERNEL_MAJOR_MINOR}" == "6.16" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
11-
declare -g KERNELBRANCH="tag:v6.16-rc1"
11+
declare -g KERNELBRANCH="tag:v6.16-rc3"
1212
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
1313
fi
1414
}

lib/functions/compilation/patch/drivers_network.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ driver_rtl8189ES() {
7777

7878
# fix compilation for kernels >= 5.4.251
7979
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch" "applying"
80+
81+
# fix compilation for kernels >= 6.16
82+
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-v6.16.patch" "applying"
8083
fi
8184
}
8285

@@ -165,6 +168,9 @@ driver_rtl8192EU() {
165168

166169
# fix compilation for kernels >= 5.4.251
167170
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying"
171+
172+
# fix compilation for kernels >= 6.16
173+
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-v6.16.patch" "applying"
168174
fi
169175
}
170176

@@ -533,6 +539,10 @@ driver_uwe5622() {
533539
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.15-timer-api-changes.patch" "applying"
534540
fi
535541
fi
542+
543+
if linux-version compare "${version}" ge 6.15; then
544+
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.16.patch" "applying"
545+
fi
536546
fi
537547
}
538548

@@ -667,6 +677,9 @@ driver_rtl8723DS() {
667677

668678
# fix compilation for kernels >= 5.4
669679
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-VFS-import.patch" "applying"
680+
681+
# fix compilation for kernels >= 6.16
682+
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-v6.16.patch" "applying"
670683
fi
671684
}
672685

patch/kernel/archive/rockchip64-6.15/general-clk-rockchip-rk3568-Add-PLL-rate-for-33.3MHz.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

patch/kernel/archive/rockchip64-6.15/general-rockchip-overlays.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)