WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit dc5dcaf

Browse files
EvilOlafigorpecovnik
authored andcommitted
edge: bump to stable and rewrite patches
1 parent ede82db commit dc5dcaf

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

config/sources/mainline-kernel.conf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# Shared versioning logic for Armbian mainline kernels.
88
function mainline_kernel_decide_version__upstream_release_candidate_number() {
99
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
10-
if [[ "${KERNEL_MAJOR_MINOR}" == "6.18" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
11-
declare -g KERNELBRANCH="tag:v6.18-rc7"
10+
if [[ "${KERNEL_MAJOR_MINOR}" == "6.19" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
11+
declare -g KERNELBRANCH="tag:v6.19-rc1"
1212
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
1313
fi
1414
}

patch/kernel/archive/rockchip64-6.18/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
2020
#include <linux/tcp.h>
2121
#include <linux/interrupt.h>
2222
#include <linux/dma-mapping.h>
23-
@@ -2373,6 +2374,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
23+
@@ -2382,6 +2383,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
2424
}
2525
}
2626

@@ -36,7 +36,7 @@ index 111111111111..222222222222 100644
3636
static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
3737
{
3838
/* Adjust EEE LED frequency */
39-
@@ -3390,6 +3400,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
39+
@@ -3399,6 +3409,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
4040
rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
4141

4242
rtl8168_config_eee_mac(tp);

patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
1616
index 111111111111..222222222222 100644
1717
--- a/drivers/usb/dwc3/core.c
1818
+++ b/drivers/usb/dwc3/core.c
19-
@@ -152,7 +152,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool ignore_susphy)
19+
@@ -153,7 +153,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool ignore_susphy)
2020
}
2121

2222
reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG));
@@ -25,15 +25,15 @@ index 111111111111..222222222222 100644
2525
dwc3_writel(dwc->regs, DWC3_GCTL, reg);
2626

2727
dwc->current_dr_role = mode;
28-
@@ -192,6 +192,7 @@ static void __dwc3_set_mode(struct work_struct *work)
28+
@@ -193,6 +193,7 @@ static void __dwc3_set_mode(struct work_struct *work)
2929
dwc3_host_exit(dwc);
3030
break;
3131
case DWC3_GCTL_PRTCAP_DEVICE:
3232
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
3333
dwc3_gadget_exit(dwc);
3434
dwc3_event_buffers_cleanup(dwc);
3535
break;
36-
@@ -211,12 +212,43 @@ static void __dwc3_set_mode(struct work_struct *work)
36+
@@ -212,12 +213,43 @@ static void __dwc3_set_mode(struct work_struct *work)
3737
* Only perform GCTL.CoreSoftReset when there's DRD role switching.
3838
*/
3939
if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) ||
@@ -78,15 +78,15 @@ index 111111111111..222222222222 100644
7878
/*
7979
* Wait for internal clocks to synchronized. DWC_usb31 and
8080
* DWC_usb32 may need at least 50ms (less for DWC_usb3). To
81-
@@ -258,6 +290,7 @@ static void __dwc3_set_mode(struct work_struct *work)
81+
@@ -259,6 +291,7 @@ static void __dwc3_set_mode(struct work_struct *work)
8282
}
8383
break;
8484
case DWC3_GCTL_PRTCAP_DEVICE:
8585
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
8686
dwc3_core_soft_reset(dwc);
8787

8888
dwc3_event_buffers_setup(dwc);
89-
@@ -1845,6 +1878,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
89+
@@ -1846,6 +1879,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
9090

9191
dwc->dis_split_quirk = device_property_read_bool(dev,
9292
"snps,dis-split-quirk");
@@ -95,15 +95,15 @@ index 111111111111..222222222222 100644
9595

9696
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
9797
dwc->tx_de_emphasis = tx_de_emphasis;
98-
@@ -2441,6 +2476,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
98+
@@ -2442,6 +2477,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
9999

100100
switch (dwc->current_dr_role) {
101101
case DWC3_GCTL_PRTCAP_DEVICE:
102102
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
103103
if (pm_runtime_suspended(dwc->dev))
104104
break;
105105
ret = dwc3_gadget_suspend(dwc);
106-
@@ -2505,11 +2541,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
106+
@@ -2506,11 +2542,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
107107

108108
switch (dwc->current_dr_role) {
109109
case DWC3_GCTL_PRTCAP_DEVICE:
@@ -117,23 +117,23 @@ index 111111111111..222222222222 100644
117117
dwc3_gadget_resume(dwc);
118118
break;
119119
case DWC3_GCTL_PRTCAP_HOST:
120-
@@ -2573,6 +2610,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc)
120+
@@ -2574,6 +2611,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc)
121121
{
122122
switch (dwc->current_dr_role) {
123123
case DWC3_GCTL_PRTCAP_DEVICE:
124124
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
125125
if (dwc->connected)
126126
return -EBUSY;
127127
break;
128-
@@ -2611,6 +2649,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc)
128+
@@ -2612,6 +2650,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc)
129129

130130
switch (dwc->current_dr_role) {
131131
case DWC3_GCTL_PRTCAP_DEVICE:
132132
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
133133
if (dwc->pending_events) {
134134
pm_runtime_put(dev);
135135
dwc->pending_events = false;
136-
@@ -2635,6 +2674,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc)
136+
@@ -2636,6 +2675,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc)
137137

138138
switch (dwc->current_dr_role) {
139139
case DWC3_GCTL_PRTCAP_DEVICE:

patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
1818
index 111111111111..222222222222 100644
1919
--- a/drivers/usb/dwc3/core.c
2020
+++ b/drivers/usb/dwc3/core.c
21-
@@ -932,6 +932,7 @@ static int dwc3_phy_power_on(struct dwc3 *dwc)
21+
@@ -933,6 +933,7 @@ static int dwc3_phy_power_on(struct dwc3 *dwc)
2222
goto err_power_off_usb3_phy;
2323
}
2424

2525
+ dwc->usb3_phy_powered = true;
2626
return 0;
2727

2828
err_power_off_usb3_phy:
29-
@@ -952,8 +953,10 @@ static void dwc3_phy_power_off(struct dwc3 *dwc)
29+
@@ -953,8 +954,10 @@ static void dwc3_phy_power_off(struct dwc3 *dwc)
3030
{
3131
int i;
3232

0 commit comments

Comments
 (0)