Skip to content

Commit 68bc00d

Browse files
EvilOlafigorpecovnik
authored andcommitted
rewrite kernel patches
1 parent 260f31c commit 68bc00d

6 files changed

+8
-10
lines changed

patch/kernel/archive/sunxi-6.18/patches.armbian/drv-clk-sunxi-ng-fix-clock-handling-for-ccu-sun55i-a523.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Signed-off-by: Marvin Wewer <mwewer37@proton.me>
77
---
88
drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 13 +++++++++-
99
include/dt-bindings/clock/sun55i-a523-ccu.h | 1 +
10-
3 files changed, 13 insertions(+), 1 deletion(-)
10+
2 files changed, 13 insertions(+), 1 deletion(-)
1111

1212
diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
1313
index 111111111111..222222222222 100644

patch/kernel/archive/sunxi-6.18/patches.armbian/drv-iommu-sunxi-add-iommu-driver.patch

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,11 +2264,6 @@ index 000000000000..111111111111
22642264
+
22652265
+subsys_initcall(sunxi_iommu_init);
22662266
+module_exit(sunxi_iommu_exit);
2267-
+
2268-
+MODULE_LICENSE("GPL v2");
2269-
+MODULE_VERSION("1.5.1");
2270-
+MODULE_AUTHOR("huangshuosheng<huangshuosheng@allwinnertech.com>");
2271-
+MODULE_AUTHOR("ouayngkun<ouyangkun@allwinnertech.com>");
22722267
diff --git a/drivers/iommu/sun55i-iommu.h b/drivers/iommu/sun55i-iommu.h
22732268
new file mode 100644
22742269
index 000000000000..111111111111
@@ -2391,3 +2386,4 @@ index 000000000000..111111111111
23912386
\ No newline at end of file
23922387
--
23932388
Armbian
2389+

patch/kernel/archive/sunxi-6.18/patches.armbian/drv-pci-sunxi-enable-pcie-support.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3282,3 +3282,4 @@ index 000000000000..111111111111
32823282
+#endif
32833283
--
32843284
Armbian
3285+

patch/kernel/archive/sunxi-6.18/patches.armbian/drv-phy-allwinner-add-pcie-usb3-driver.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,3 +1236,4 @@ index 000000000000..111111111111
12361236
+MODULE_LICENSE("GPL v2");
12371237
--
12381238
Armbian
1239+

patch/kernel/archive/sunxi-6.18/patches.megous/fixes-6.18/0019-usb-serial-option-add-reset_resume-callback-for-WWAN.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
2020
index 111111111111..222222222222 100644
2121
--- a/drivers/usb/serial/option.c
2222
+++ b/drivers/usb/serial/option.c
23-
@@ -2536,6 +2536,7 @@ static struct usb_serial_driver option_1port_device = {
23+
@@ -2537,6 +2537,7 @@ static struct usb_serial_driver option_1port_device = {
2424
#ifdef CONFIG_PM
2525
.suspend = usb_wwan_suspend,
2626
.resume = usb_wwan_resume,

patch/kernel/archive/sunxi-6.18/patches.megous/fixes-6.18/0024-Revert-usb-dwc3-Abort-suspend-on-soft-disconnect-fai.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
1313
index 111111111111..222222222222 100644
1414
--- a/drivers/usb/dwc3/core.c
1515
+++ b/drivers/usb/dwc3/core.c
16-
@@ -2425,7 +2425,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
16+
@@ -2427,7 +2427,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
1717
{
1818
u32 reg;
1919
int i;
2020
- int ret;
2121

2222
if (!pm_runtime_suspended(dwc->dev) && !PMSG_IS_AUTO(msg)) {
2323
dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &
24-
@@ -2444,9 +2443,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
24+
@@ -2446,9 +2445,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
2525
case DWC3_GCTL_PRTCAP_DEVICE:
2626
if (pm_runtime_suspended(dwc->dev))
2727
break;
@@ -32,7 +32,7 @@ index 111111111111..222222222222 100644
3232
synchronize_irq(dwc->irq_gadget);
3333
dwc3_core_exit(dwc);
3434
break;
35-
@@ -2481,9 +2478,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
35+
@@ -2483,9 +2480,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
3636
break;
3737

3838
if (dwc->current_otg_role == DWC3_OTG_ROLE_DEVICE) {

0 commit comments

Comments
 (0)