enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip64 edge 6.6: bump to 6.6-rc6; rebase patches

Browse Source
This commit is contained in:
Ricardo Pardini 2023-10-20 12:59:33 +02:00 committed by Igor
parent b89858d4d2
commit 3ed795e4cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/rockchip64_common.inc
View File

@ -155,7 +155,7 @@ case $BRANCH in
KERNELPATCHDIR='rockchip64-'$BRANCH
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
#KERNELBRANCH="branch:linux-6.6.y"
KERNELBRANCH='tag:v6.6-rc5'
KERNELBRANCH='tag:v6.6-rc6'
LINUXFAMILY=rockchip64
LINUXCONFIG='linux-rockchip64-'$BRANCH

4
patch/kernel/archive/rockchip64-6.6/board-pbp-add-dp-alt-mode.patch
View File

@ -76,7 +76,7 @@ index 4efcb78b0ab1..6a641d9f752c 100644
pm_runtime_enable(dev);
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index 426c88a516e5..e9094255a9be 100644
index 59e0218a8bc5..5b046eb1fad7 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -9,6 +9,8 @@
@ -157,7 +157,7 @@ index 426c88a516e5..e9094255a9be 100644
break;
default:
break;
@@ -574,8 +616,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
@@ -579,8 +621,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) &
DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) &&
!(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) &