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.16: re-export patces to v6.16.8

Browse Source
This commit is contained in:
The-going
2025-09-20 12:06:15 +03:00
committed by Igor
parent 72ee3fe714
commit 6db90af653
10 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-n.patch → patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-not-in-the-m.patch
View File

@@ -1,8 +1,8 @@
From aeb99ba3659e8147e9f01a5ddfd529f1e1b16358 Mon Sep 17 00:00:00 2001
From c14e5e16fb3eb34fbfc87bd4aefd88981a9d767f Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 9 Aug 2025 14:47:14 +0200
Subject: [PATCH 3/3] drm: sun4i: Report page flip after vsync is complete, not
in the middle
Subject: drm: sun4i: Report page flip after vsync is complete, not in the
middle
See: https://xnux.eu/log/080.html
@@ -13,7 +13,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 221df37406d8..25c8bff308f2 100644
index 43cc8908a03f..2d0e689bf877 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -240,6 +240,9 @@ void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable)
@@ -26,7 +26,7 @@ index 221df37406d8..25c8bff308f2 100644
regmap_update_bits(tcon->regs, SUN4I_TCON_GINT0_REG, mask, val);
}
EXPORT_SYMBOL(sun4i_tcon_enable_vblank);
@@ -838,6 +841,17 @@ static void sun4i_tcon_finish_page_flip(struct drm_device *dev,
@@ -850,6 +853,17 @@ static void sun4i_tcon_finish_page_flip(struct drm_device *dev,
spin_unlock_irqrestore(&dev->event_lock, flags);
}
@@ -44,7 +44,7 @@ index 221df37406d8..25c8bff308f2 100644
static irqreturn_t sun4i_tcon_handler(int irq, void *private)
{
struct sun4i_tcon *tcon = private;
@@ -853,8 +867,12 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)
@@ -865,8 +879,12 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)
SUN4I_TCON_GINT0_TCON0_TRI_FINISH_INT)))
return IRQ_NONE;
@@ -59,7 +59,7 @@ index 221df37406d8..25c8bff308f2 100644
/* Acknowledge the interrupt */
regmap_update_bits(tcon->regs, SUN4I_TCON_GINT0_REG,
@@ -903,6 +921,9 @@ static int sun4i_tcon_init_irq(struct device *dev,
@@ -915,6 +933,9 @@ static int sun4i_tcon_init_irq(struct device *dev,
struct platform_device *pdev = to_platform_device(dev);
int irq, ret;
@@ -69,7 +69,7 @@ index 221df37406d8..25c8bff308f2 100644
irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;
@@ -1616,6 +1637,7 @@ static const struct sun4i_tcon_quirks sun50i_a64_lcd_quirks = {
@@ -1628,6 +1649,7 @@ static const struct sun4i_tcon_quirks sun50i_a64_lcd_quirks = {
.restores_rate = true,
.dclk_min_div = 1,
.setup_lvds_phy = sun6i_tcon_setup_lvds_phy,

12
patch/kernel/archive/sunxi-6.16/patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_compon.patch → patch/kernel/archive/sunxi-6.16/patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_component-and-snd.patch
View File

@@ -1,8 +1,8 @@
From f79f3df0f61a6c7bdc08e2318cb3f33398f50442 Mon Sep 17 00:00:00 2001
From fdf9a313361032f5524bcbb6afd964b95c900415 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Fri, 8 Aug 2025 17:54:21 +0200
Subject: [PATCH 1/3] Revert "ASoC: soc-core: merge
snd_soc_unregister_component() and snd_soc_unregister_component_by_driver()"
Subject: Revert "ASoC: soc-core: merge snd_soc_unregister_component() and
snd_soc_unregister_component_by_driver()"
This reverts commit 144d6dfc7482455eabf8e8caa974a6e8d9572705.
---
@@ -24,10 +24,10 @@ index 1fffef311c41..8d113ee8c2bc 100644
const struct snd_soc_component_driver *component_driver);
struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 67bebc339148..ab615ec113d2 100644
index d31ee6e9abef..222edc0b433a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2927,14 +2927,34 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component);
@@ -2931,14 +2931,34 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component);
void snd_soc_unregister_component_by_driver(struct device *dev,
const struct snd_soc_component_driver *component_driver)
{
@@ -66,7 +66,7 @@ index 67bebc339148..ab615ec113d2 100644
if (!component)
break;
@@ -2943,7 +2963,7 @@ void snd_soc_unregister_component_by_driver(struct device *dev,
@@ -2947,7 +2967,7 @@ void snd_soc_unregister_component_by_driver(struct device *dev,
}
mutex_unlock(&client_mutex);
}

21
patch/kernel/archive/sunxi-6.16/patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-fai.patch → patch/kernel/archive/sunxi-6.16/patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-failure.patch
View File

@@ -1,8 +1,7 @@
From 48c707b5f50a1cd87925a725e5c85ac06b19219f Mon Sep 17 00:00:00 2001
From bfaf13fd69401d5c6e0f512277e3f84bd12b1036 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 9 Aug 2025 10:10:42 +0200
Subject: [PATCH 2/3] Revert "usb: dwc3: Abort suspend on soft disconnect
failure"
Subject: Revert "usb: dwc3: Abort suspend on soft disconnect failure"
This reverts commit 630a1dec3b0eba2a695b9063f1c205d585cbfec9.
---
@@ -11,10 +10,10 @@ This reverts commit 630a1dec3b0eba2a695b9063f1c205d585cbfec9.
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 91dec9c81a40..1e436ac6a1fa 100644
index 8002c23a5a02..2bc775a747f2 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -2460,7 +2460,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
@@ -2422,7 +2422,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
{
u32 reg;
int i;
@@ -22,8 +21,8 @@ index 91dec9c81a40..1e436ac6a1fa 100644
if (!pm_runtime_suspended(dwc->dev) && !PMSG_IS_AUTO(msg)) {
dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &
@@ -2480,9 +2479,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
@@ -2441,9 +2440,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
case DWC3_GCTL_PRTCAP_DEVICE:
if (pm_runtime_suspended(dwc->dev))
break;
- ret = dwc3_gadget_suspend(dwc);
@@ -33,7 +32,7 @@ index 91dec9c81a40..1e436ac6a1fa 100644
synchronize_irq(dwc->irq_gadget);
dwc3_core_exit(dwc);
break;
@@ -2517,9 +2514,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
@@ -2478,9 +2475,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
break;
if (dwc->current_otg_role == DWC3_OTG_ROLE_DEVICE) {
@@ -45,10 +44,10 @@ index 91dec9c81a40..1e436ac6a1fa 100644
}
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 74968f93d4a3..99fbd29d8f46 100644
index 6ab6c9f163b8..41a31d02de87 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -4821,15 +4821,8 @@ int dwc3_gadget_suspend(struct dwc3 *dwc)
@@ -4836,15 +4836,8 @@ int dwc3_gadget_suspend(struct dwc3 *dwc)
int ret;
ret = dwc3_gadget_soft_disconnect(dwc);
@@ -66,7 +65,7 @@ index 74968f93d4a3..99fbd29d8f46 100644
spin_lock_irqsave(&dwc->lock, flags);
if (dwc->gadget_driver)
@@ -4837,6 +4830,17 @@ int dwc3_gadget_suspend(struct dwc3 *dwc)
@@ -4852,6 +4845,17 @@ int dwc3_gadget_suspend(struct dwc3 *dwc)
spin_unlock_irqrestore(&dwc->lock, flags);
return 0;

8
patch/kernel/archive/sunxi-6.16/patches.megous/Revert-usb-typec-tcpm-unregister-existing-source-caps-before-re.patch
View File

@@ -1,4 +1,4 @@
From f09463fbf2e97fc513284548edc066724bb834f8 Mon Sep 17 00:00:00 2001
From 18df5a34038c63bf771a9ab221c874e601b81f2e Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Tue, 7 May 2024 18:39:12 +0200
Subject: Revert "usb: typec: tcpm: unregister existing source caps before
@@ -10,10 +10,10 @@ This reverts commit 230ecdf71a644c9c73e0e6735b33173074ae3f94.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 1f6fdfaa34bf..1043efce328d 100644
index b2a568a5bc9b..41d285d8f9f2 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3110,7 +3110,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
@@ -3114,7 +3114,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
{
struct usb_power_delivery_desc desc = { port->negotiated_rev };
struct usb_power_delivery_capabilities_desc caps = { };
@@ -22,7 +22,7 @@ index 1f6fdfaa34bf..1043efce328d 100644
if (!port->partner_pd)
port->partner_pd = usb_power_delivery_register(NULL, &desc);
@@ -3120,11 +3120,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
@@ -3124,11 +3124,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
memcpy(caps.pdo, port->source_caps, sizeof(u32) * port->nr_source_caps);
caps.role = TYPEC_SOURCE;

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

@@ -1,4 +1,4 @@
From 9d9364611537fdb9c1de2998363da7ff7a57ea5a Mon Sep 17 00:00:00 2001
From 6668c2e647703b7664475a4069d8cb5e08cdb535 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 e5cd33093423..735ff1caea88 100644
index fc869b7f803f..dc050d59c082 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2481,6 +2481,7 @@ static struct usb_serial_driver option_1port_device = {
@@ -2498,6 +2498,7 @@ static struct usb_serial_driver option_1port_device = {
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,

10
patch/kernel/archive/sunxi-6.16/patches.megous/usb-typec-tcpm-Fix-PD-devices-capabilities-registration.patch
View File

@@ -1,4 +1,4 @@
From d81c5129fcbc7ede3e62d86234c2360b7823ce1d Mon Sep 17 00:00:00 2001
From b05486720062e0bded36291a6f54dfb7c1530598 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 18 Feb 2023 00:38:44 +0100
Subject: usb: typec: tcpm: Fix PD devices/capabilities registration
@@ -15,10 +15,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 1f20ea608843..bb8cf63f3df7 100644
index 735afaf197dd..6b02baceab3e 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3114,15 +3114,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
@@ -3118,15 +3118,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
struct usb_power_delivery_desc desc = { port->negotiated_rev };
struct usb_power_delivery_capabilities_desc caps = { };
struct usb_power_delivery_capabilities *cap;
@@ -45,7 +45,7 @@ index 1f20ea608843..bb8cf63f3df7 100644
cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
if (IS_ERR(cap))
return PTR_ERR(cap);
@@ -3137,15 +3144,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port)
@@ -3141,15 +3148,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port)
struct usb_power_delivery_desc desc = { port->negotiated_rev };
struct usb_power_delivery_capabilities_desc caps = { };
struct usb_power_delivery_capabilities *cap;
@@ -72,7 +72,7 @@ index 1f20ea608843..bb8cf63f3df7 100644
cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
if (IS_ERR(cap))
return PTR_ERR(cap);
@@ -7208,10 +7222,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
@@ -7212,10 +7226,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
port->pds[i] = usb_power_delivery_register(port->dev, &desc);
if (IS_ERR(port->pds[i])) {
ret = PTR_ERR(port->pds[i]);

10
patch/kernel/archive/sunxi-6.16/patches.megous/usb-typec-tcpm-Improve-logs.patch
View File

@@ -1,4 +1,4 @@
From 63d9fa6213564aadc5a722c23e7193a6145b9e21 Mon Sep 17 00:00:00 2001
From 8189e2f8b1e8d73890b335b4255fa07e1e11fb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Tue, 23 Nov 2021 17:58:05 +0100
Subject: usb: typec: tcpm: Improve logs
@@ -11,7 +11,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index bb8cf63f3df7..11c42befab25 100644
index 6b02baceab3e..9ce4a2cf7306 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -1001,10 +1001,13 @@ static int tcpm_pd_transmit(struct tcpm_port *port,
@@ -30,7 +30,7 @@ index bb8cf63f3df7..11c42befab25 100644
reinit_completion(&port->tx_complete);
ret = port->tcpc->pd_transmit(port->tcpc, tx_sop_type, msg, negotiated_rev);
@@ -3797,6 +3800,10 @@ void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg,
@@ -3801,6 +3804,10 @@ void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg,
enum tcpm_transmit_type rx_sop_type)
{
struct pd_rx_event *event;
@@ -41,7 +41,7 @@ index bb8cf63f3df7..11c42befab25 100644
event = kzalloc(sizeof(*event), GFP_ATOMIC);
if (!event)
@@ -6153,7 +6160,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
@@ -6157,7 +6164,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
static void _tcpm_pd_vbus_on(struct tcpm_port *port)
{
@@ -50,7 +50,7 @@ index bb8cf63f3df7..11c42befab25 100644
port->vbus_present = true;
/*
* When vbus_present is true i.e. Voltage at VBUS is greater than VSAFE5V implicitly
@@ -6243,7 +6250,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
@@ -6247,7 +6254,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
static void _tcpm_pd_vbus_off(struct tcpm_port *port)
{

6
patch/kernel/archive/sunxi-6.16/series.conf
View File

@@ -238,8 +238,8 @@
patches.megous/Add-support-for-my-private-Sapomat-device.patch
patches.megous/ARM-dts-sun8i-h3-orange-pi-one-Enable-all-gpio-header-UARTs.patch
patches.megous/mtd-spi-nor-Add-Alliance-memory-support.patch
patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_compon.patch
patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-fai.patch
patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_component-and-snd.patch
patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-failure.patch
patches.megous/Defconfigs-for-all-my-devices.patch
################################################################################
@@ -272,4 +272,4 @@
patches.drm/drm-sun4i-de33-fmt-add-Display-Engine-3.3-DE33-support.patch
patches.drm/drm-sun4i-de33-csc-add-Display-Engine-3.3-DE33-support.patch
patches.drm/drm-sun4i-add-sun50i-h616-hdmi-phy-support.patch
patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-n.patch
patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-not-in-the-m.patch

2
patch/kernel/archive/sunxi-6.16/series.drm
View File

@@ -28,4 +28,4 @@
patches.drm/drm-sun4i-de33-fmt-add-Display-Engine-3.3-DE33-support.patch
patches.drm/drm-sun4i-de33-csc-add-Display-Engine-3.3-DE33-support.patch
patches.drm/drm-sun4i-add-sun50i-h616-hdmi-phy-support.patch
patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-n.patch
patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-not-in-the-m.patch

4
patch/kernel/archive/sunxi-6.16/series.megous
View File

@@ -237,6 +237,6 @@
patches.megous/Add-support-for-my-private-Sapomat-device.patch
patches.megous/ARM-dts-sun8i-h3-orange-pi-one-Enable-all-gpio-header-UARTs.patch
patches.megous/mtd-spi-nor-Add-Alliance-memory-support.patch
patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_compon.patch
patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-fai.patch
patches.megous/Revert-ASoC-soc-core-merge-snd_soc_unregister_component-and-snd.patch
patches.megous/Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-failure.patch
patches.megous/Defconfigs-for-all-my-devices.patch