aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-27 14:56:33 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-28 16:32:45 +0100
commitbbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch)
treee874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/ramips/patches-5.4
parent26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff)
downloadupstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz
upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2
upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip
kernel: bump 5.4 to 5.4.161
Removed upstreamed: ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1] Manually rebased: layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch All other patches automatically rebased. 1. Private email exchange with patch author, Hauke Mehrtens Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ramips/patches-5.4')
-rw-r--r--target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch6
-rw-r--r--target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch2
-rw-r--r--target/linux/ramips/patches-5.4/0098-disable_cm.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch
index 306ae6cfda..f088babc4e 100644
--- a/target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2911,6 +2911,18 @@ static const struct usb_device_id uvc_id
+@@ -2916,6 +2916,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <media/v4l2-common.h>
-@@ -1183,9 +1188,149 @@ static void uvc_video_decode_data(struct
+@@ -1188,9 +1193,149 @@ static void uvc_video_decode_data(struct
uvc_urb->async_operations++;
}
@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
-@@ -1742,6 +1887,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1747,6 +1892,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0)
return -ENOMEM;
diff --git a/target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch
index 4822226610..7192d61323 100644
--- a/target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch
+++ b/target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -416,6 +416,9 @@ uart_get_baud_rate(struct uart_port *por
+@@ -423,6 +423,9 @@ uart_get_baud_rate(struct uart_port *por
break;
}
diff --git a/target/linux/ramips/patches-5.4/0098-disable_cm.patch b/target/linux/ramips/patches-5.4/0098-disable_cm.patch
index 9b280aef99..1f3367568f 100644
--- a/target/linux/ramips/patches-5.4/0098-disable_cm.patch
+++ b/target/linux/ramips/patches-5.4/0098-disable_cm.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
-@@ -233,6 +233,7 @@ int mips_cm_probe(void)
+@@ -232,6 +232,7 @@ int mips_cm_probe(void)
/* disable CM regions */
write_gcr_reg0_base(CM_GCR_REGn_BASE_BASEADDR);
@@ -8,7 +8,7 @@
write_gcr_reg0_mask(CM_GCR_REGn_MASK_ADDRMASK);
write_gcr_reg1_base(CM_GCR_REGn_BASE_BASEADDR);
write_gcr_reg1_mask(CM_GCR_REGn_MASK_ADDRMASK);
-@@ -240,7 +241,7 @@ int mips_cm_probe(void)
+@@ -239,7 +240,7 @@ int mips_cm_probe(void)
write_gcr_reg2_mask(CM_GCR_REGn_MASK_ADDRMASK);
write_gcr_reg3_base(CM_GCR_REGn_BASE_BASEADDR);
write_gcr_reg3_mask(CM_GCR_REGn_MASK_ADDRMASK);