From 0a4a1af37f06f58dfd44fc171c4045d6be035e7c Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Wed, 12 Oct 2022 23:49:44 +0800 Subject: [PATCH] kernel: bump 5.19 to 5.19.15 (#10247) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-5.19 | 4 +-- ...56x-fix-upper-usb-port-on-BPI-R2-Pro.patch | 28 ------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 target/linux/rockchip/patches-5.19/0050-arm64-dts-rk356x-fix-upper-usb-port-on-BPI-R2-Pro.patch diff --git a/include/kernel-5.19 b/include/kernel-5.19 index b88ace741..a12983136 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.19 = .14 -LINUX_KERNEL_HASH-5.19.14 = 1ded27e1c4a8b51df5f93f2f772827183b805d9ab4771071307c13ee86cd1ac1 +LINUX_VERSION-5.19 = .15 +LINUX_KERNEL_HASH-5.19.15 = 4686e33847db3ec58e1043bc0c806472aae694b2c413bb7d8da91a5c9a55eb1b diff --git a/target/linux/rockchip/patches-5.19/0050-arm64-dts-rk356x-fix-upper-usb-port-on-BPI-R2-Pro.patch b/target/linux/rockchip/patches-5.19/0050-arm64-dts-rk356x-fix-upper-usb-port-on-BPI-R2-Pro.patch deleted file mode 100644 index c79420f0a..000000000 --- a/target/linux/rockchip/patches-5.19/0050-arm64-dts-rk356x-fix-upper-usb-port-on-BPI-R2-Pro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c4e625e488b938bd312cde239cd902c479cba02e Mon Sep 17 00:00:00 2001 -From: Frank Wunderlich -Date: Fri, 8 Jul 2022 15:27:06 +0200 -Subject: [PATCH 50/51] arm64: dts: rk356x: fix upper usb port on BPI-R2-Pro - -- extcon is no more needed in 5.19 - so drop it - commit 51a9b2c03dd3 ("phy: rockchip-inno-usb2: Handle ID IRQ") -- dr_mode was changed from host to otg in rk356x.dtsi - commit bc405bb3eeee ("arm64: dts: rockchip: enable otg/drd - operation of usb_host0_xhci in rk356x") - change it back on board level as id-pin on r2pro is not connected - -Signed-off-by: Frank Wunderlich ---- - arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts -@@ -755,7 +755,7 @@ - }; - - &usb_host0_xhci { -- extcon = <&usb2phy0>; -+ dr_mode = "host"; - status = "okay"; - }; -