qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.12: re-export megous, drm patches to v6.12.20

This commit is contained in:
The-going 2025-03-23 16:18:41 +03:00 committed by Igor
parent 332d300fd8
commit 748e04ed20
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patch/kernel/archive/sunxi-6.12/patches.drm/arm64-dts-allwinner-h616-Add-Mali-GPU-node.patch
View File

@ -1,4 +1,4 @@
From abf45c2a696b446a0f065f6d741d5a3767e56909 Mon Sep 17 00:00:00 2001
From 15692a28a4b04cd368fd4391f31285370fa8c970 Mon Sep 17 00:00:00 2001
From: Andre Przywara <andre.przywara@arm.com>
Date: Fri, 21 Feb 2025 00:58:01 +0000
Subject: arm64: dts: allwinner: h616: Add Mali GPU node
@ -18,7 +18,7 @@ Signed-off-by: Andre Przywara <andre.przywara@arm.com>
1 file changed, 21 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index cdce3dcb8ec0..ceedae9e399b 100644
index e88c1fbac6ac..f1503f29365c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -150,6 +150,21 @@ soc {
@ -43,7 +43,7 @@ index cdce3dcb8ec0..ceedae9e399b 100644
crypto: crypto@1904000 {
compatible = "allwinner,sun50i-h616-crypto";
reg = <0x01904000 0x800>;
@@ -874,6 +889,12 @@ r_ccu: clock@7010000 {
@@ -860,6 +875,12 @@ r_ccu: clock@7010000 {
#reset-cells = <1>;
};

8
patch/kernel/archive/sunxi-6.12/patches.drm/drm-panfrost-add-h616-compatible-string.patch
View File

@ -1,4 +1,4 @@
From fe3a7a361a95f4720824cdc82ce4dba878d90cf2 Mon Sep 17 00:00:00 2001
From b6263a762add90b0c5fe1fb9e54d9a43f943c731 Mon Sep 17 00:00:00 2001
From: Philippe Simons <simons.philippe@gmail.com>
Date: Thu, 13 Mar 2025 00:23:19 +0100
Subject: drm/panfrost: add h616 compatible string
@ -13,10 +13,10 @@ Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index ee3864476eb9..a511edc3c045 100644
index 671eed4ad890..baa2e72cf56b 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -777,6 +777,13 @@ static const struct panfrost_compatible default_data = {
@@ -736,6 +736,13 @@ static const struct panfrost_compatible default_data = {
.pm_domain_names = NULL,
};
@ -30,7 +30,7 @@ index ee3864476eb9..a511edc3c045 100644
static const struct panfrost_compatible amlogic_data = {
.num_supplies = ARRAY_SIZE(default_supplies) - 1,
.supply_names = default_supplies,
@@ -860,6 +867,7 @@ static const struct of_device_id dt_match[] = {
@@ -819,6 +826,7 @@ static const struct of_device_id dt_match[] = {
{ .compatible = "mediatek,mt8186-mali", .data = &mediatek_mt8186_data },
{ .compatible = "mediatek,mt8188-mali", .data = &mediatek_mt8188_data },
{ .compatible = "mediatek,mt8192-mali", .data = &mediatek_mt8192_data },

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

@ -1,4 +1,4 @@
From e1f725426dfc3eb2d91a7f4eaf581933ae5e9108 Mon Sep 17 00:00:00 2001
From 86bd1ff575fb7fa688b28e91b225ddcbc8e857d2 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 58bd54e8c483..09b9c19a5178 100644
index 5cd26dac2069..f65c1d78a2cc 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2455,6 +2455,7 @@ static struct usb_serial_driver option_1port_device = {
@@ -2471,6 +2471,7 @@ static struct usb_serial_driver option_1port_device = {
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,