Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sunxi-6.11: Switch to v6.11.9; Fix build dtb package #7502

Merged
merged 2 commits into from
Nov 20, 2024
+20 −17
Merged

sunxi-6.11: Switch to v6.11.9; Fix build dtb package #7502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7092dcd
sunxi-6.11: Switch to v6.11.9, reextract megous patches
The-going Nov 19, 2024
7aa4991
sunxi-6.11: Fix build dtb package
The-going Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 10 additions & 7 deletions ...h/kernel/archive/sunxi-6.11/patches.armbian/scripts-add-overlay-compilation-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
From 0184e44b9caf2fa96cc058f0bb34fd5ca4ca4498 Mon Sep 17 00:00:00 2001
From 9834ff87ee93495982c223bea78206bda5955e89 Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Tue, 1 Feb 2022 21:04:08 +0300
Subject: scripts: add overlay compilation support

---
.gitignore | 1 +
scripts/Makefile.dtbinst | 9 ++++++++-
scripts/Makefile.dtbinst | 12 +++++++++++-
scripts/Makefile.lib | 12 +++++++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58fdbb35e2f1..0d683e66d33b 100644
Expand All @@ -22,7 +22,7 @@ index 58fdbb35e2f1..0d683e66d33b 100644
*.so.dbg
*.su
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 9d920419a62c..b66af344040d 100644
index 9d920419a62c..d0703c2148cf 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -23,6 +23,11 @@ $(dst)/%: $(obj)/%
Expand All @@ -37,14 +37,17 @@ index 9d920419a62c..b66af344040d 100644

ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL

@@ -33,7 +38,9 @@ endef
@@ -33,7 +38,12 @@ endef

$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))

-dtbs := $(notdir $(dtbs))
+# Armbian uses subdirectories <overlay> but not <allwinner/overlay>.
+# delete the vendor's directory
+# Armbian uses subdirectories <overlay> for arm
+# and <allwinner/overlay> for arm64.
+# delete the vendor's directory if the target architecture is an arm.
+ifdef CONFIG_ARM
+dtbs := $(patsubst $(vendor)%,%,$(dtbs))
+endif

endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL

Expand Down
10 changes: 5 additions & 5 deletions ...6.11/patches.megous/usb-musb-sunxi-Avoid-enabling-host-side-code-on-SoCs-where-it-s.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Date: Mon, 6 Mar 2023 01:19:52 +0100
Subject: usb: musb: sunxi: Avoid enabling host side code on SoCs where it's
Expand Down Expand Up @@ -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;

Expand All @@ -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,
};

Expand All @@ -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");

Expand Down
6 changes: 3 additions & 3 deletions ...xi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Date: Tue, 20 Sep 2022 20:34:57 -0400
Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
Expand All @@ -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,
Expand Down