diff --git a/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch b/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch index 4b2e24fe1..366418642 100644 --- a/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch +++ b/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch @@ -1,7 +1,7 @@ -From 988f69b247fa3a1b70876395342aeb8c7dc2e834 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: graysky Date: Mon, 7 Dec 2020 13:03:40 -0500 -Subject: [PATCH] Make /proc/cpuinfo consistent on arm64 and arm +Subject: Make /proc/cpuinfo consistent on arm64 and arm Signed-off-by: graysky --- @@ -9,10 +9,10 @@ Signed-off-by: graysky 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 721350d21074..88e2b8fcd7e6 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -153,9 +153,8 @@ static int c_show(struct seq_file *m, void *v) +@@ -175,9 +175,8 @@ static int c_show(struct seq_file *m, void *v) * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); @@ -25,5 +25,5 @@ index 721350d21074..88e2b8fcd7e6 100644 seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", loops_per_jiffy / (500000UL/HZ), -- -2.29.2 +Armbian diff --git a/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch b/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch index 3c4c08221..07c7b523f 100644 --- a/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch +++ b/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch @@ -1,8 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Mon, 29 Aug 2022 08:43:24 +0200 +Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) + +> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 +> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here +> X-Git-Archeology: > recovered message: > * Update config +> X-Git-Archeology: > recovered message: > * Update edge config +> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 +> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) +> X-Git-Archeology: +> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e +> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 +> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 +> X-Git-Archeology: From: Igor +> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) +> X-Git-Archeology: +> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 +> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy +> X-Git-Archeology: +--- + drivers/usb/dwc2/gadget.c | 73 ++++++++++ + drivers/usb/gadget/function/f_hid.c | 14 ++ + drivers/usb/gadget/function/u_hid.h | 1 + + 3 files changed, 88 insertions(+) + diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index 0909b088a284..31ff5348020c 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c -@@ -4763,6 +4763,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp +@@ -4773,6 +4773,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp spin_unlock_irqrestore(&hsotg->lock, flags); } @@ -81,7 +116,7 @@ index 0909b088a284..31ff5348020c 100644 static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { .get_frame = dwc2_hsotg_gadget_getframe, .set_selfpowered = dwc2_hsotg_set_selfpowered, -@@ -4772,6 +4844,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { +@@ -4782,6 +4854,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { .udc_set_speed = dwc2_gadget_set_speed, .vbus_session = dwc2_hsotg_vbus_session, .vbus_draw = dwc2_hsotg_vbus_draw, @@ -90,7 +125,7 @@ index 0909b088a284..31ff5348020c 100644 /** diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index ca0a7d9eaa34..cf11ab8e88e0 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c @@ -54,6 +54,8 @@ struct f_hidg { @@ -102,7 +137,7 @@ index ca0a7d9eaa34..cf11ab8e88e0 100644 /* recv report */ spinlock_t read_spinlock; -@@ -422,10 +424,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, +@@ -431,10 +433,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, size_t count, loff_t *offp) { struct f_hidg *hidg = file->private_data; @@ -122,7 +157,7 @@ index ca0a7d9eaa34..cf11ab8e88e0 100644 spin_lock_irqsave(&hidg->write_spinlock, flags); if (!hidg->req) { -@@ -1101,6 +1112,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) +@@ -1098,6 +1109,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) F_HID_OPT(subclass, 8, 255); F_HID_OPT(protocol, 8, 255); F_HID_OPT(no_out_endpoint, 8, 1); @@ -130,7 +165,7 @@ index ca0a7d9eaa34..cf11ab8e88e0 100644 F_HID_OPT(report_length, 16, 65535); static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) -@@ -1161,6 +1173,7 @@ static struct configfs_attribute *hid_attrs[] = { +@@ -1158,6 +1170,7 @@ static struct configfs_attribute *hid_attrs[] = { &f_hid_opts_attr_subclass, &f_hid_opts_attr_protocol, &f_hid_opts_attr_no_out_endpoint, @@ -138,7 +173,7 @@ index ca0a7d9eaa34..cf11ab8e88e0 100644 &f_hid_opts_attr_report_length, &f_hid_opts_attr_report_desc, &f_hid_opts_attr_dev, -@@ -1293,6 +1306,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) +@@ -1299,6 +1312,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) } } hidg->use_out_ep = !opts->no_out_endpoint; @@ -147,7 +182,7 @@ index ca0a7d9eaa34..cf11ab8e88e0 100644 mutex_unlock(&opts->lock); diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h -index 84bb70292855..f7fcaf1eaf1d 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/u_hid.h +++ b/drivers/usb/gadget/function/u_hid.h @@ -21,6 +21,7 @@ struct f_hid_opts { @@ -158,3 +193,6 @@ index 84bb70292855..f7fcaf1eaf1d 100644 unsigned short report_length; unsigned short report_desc_length; unsigned char *report_desc; +-- +Armbian + diff --git a/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch b/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch index a5bb2fbc3..1cd3eaa0d 100644 --- a/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch +++ b/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch @@ -1,8 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Mon, 29 Aug 2022 08:43:24 +0200 +Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) + +> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 +> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here +> X-Git-Archeology: > recovered message: > * Update config +> X-Git-Archeology: > recovered message: > * Update edge config +> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 +> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) +> X-Git-Archeology: +> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e +> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 +> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 +> X-Git-Archeology: From: Igor +> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) +> X-Git-Archeology: +> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 +> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy +> X-Git-Archeology: +--- + drivers/usb/gadget/function/f_mass_storage.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 4a4703634a2a..cdba48f5ddf8 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2852,11 +2852,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, +@@ -2986,11 +2986,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, /* Prepare inquiryString */ i = get_default_bcdDevice(); snprintf(common->inquiry_string, sizeof(common->inquiry_string), @@ -17,3 +50,6 @@ index 4a4703634a2a..cdba48f5ddf8 100644 i); } EXPORT_SYMBOL_GPL(fsg_common_set_inquiry_string); +-- +Armbian +