JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.11: Switch to v6.11.9, reextract megous patches

Browse Source
This commit is contained in:
The-going
2024-11-19 19:35:55 +03:00
committed by Igor
parent c6b3bfe8ff
commit 17a33c1480
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ case $BRANCH in
edge)
declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.11.7"
declare -g KERNELBRANCH="tag:v6.11.9"
;;
esac

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

@@ -37,7 +37,7 @@ case $BRANCH in
edge)
declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.11.7"
declare -g KERNELBRANCH="tag:v6.11.9"
;;
esac

10
patch/kernel/archive/sunxi-6.11/patches.megous/usb-musb-sunxi-Avoid-enabling-host-side-code-on-SoCs-where-it-s.patch
View File

@@ -1,4 +1,4 @@
From 2d9f83e8ad93abcdf6da745e3fc7b46d5d75b405 Mon Sep 17 00:00:00 2001
From 6bfa3907a9179979a96b125a6f753603164bd64a Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Mon, 6 Mar 2023 01:19:52 +0100
Subject: usb: musb: sunxi: Avoid enabling host side code on SoCs where it's
@@ -42,10 +42,10 @@ index b24adb5b399f..8b3ad9101180 100644
WARNING("unhandled DISCONNECT transition (%s)\n",
musb_otg_state_string(musb));
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index d54283fd026b..7e7703de28a3 100644
index 05b6e7e52e02..63ad86def2ad 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -352,12 +352,6 @@ static int sunxi_musb_set_mode(struct musb *musb, u8 mode)
@@ -350,12 +350,6 @@ static int sunxi_musb_set_mode(struct musb *musb, u8 mode)
if (glue->phy_mode == new_mode)
return 0;
@@ -58,7 +58,7 @@ index d54283fd026b..7e7703de28a3 100644
if (musb->port1_status & USB_PORT_STAT_ENABLE)
musb_root_disconnect(musb);
@@ -676,13 +670,22 @@ static const struct musb_hdrc_config sunxi_musb_hdrc_config_4eps = {
@@ -674,13 +668,22 @@ static const struct musb_hdrc_config sunxi_musb_hdrc_config_4eps = {
.ram_bits = SUNXI_MUSB_RAM_BITS,
};
@@ -82,7 +82,7 @@ index d54283fd026b..7e7703de28a3 100644
int ret;
if (!np) {
@@ -763,6 +766,19 @@ static int sunxi_musb_probe(struct platform_device *pdev)
@@ -761,6 +764,19 @@ static int sunxi_musb_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(glue->phy),
"Error getting phy\n");

6
patch/kernel/archive/sunxi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
View File

@@ -1,4 +1,4 @@
From 27d4fc73c42a991fe4daf0731eee913491757cd7 Mon Sep 17 00:00:00 2001
From e670f01dab550fc98212f8b7c1422403a4f43442 Mon Sep 17 00:00:00 2001
From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
Date: Tue, 20 Sep 2022 20:34:57 -0400
Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed.
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 55886b64cadd..df641a38f274 100644
index 04f511adc002..d4377793ea5e 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2412,6 +2412,7 @@ static struct usb_serial_driver option_1port_device = {
@@ -2418,6 +2418,7 @@ static struct usb_serial_driver option_1port_device = {
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,