Skip to content

Commit 77a7307

Browse files
misaka36misaka36
authored
Revert "kernel: bump 5.4 to 5.4.221 (coolsnowwolf#10342)"
This reverts commit 8431ab6.
1 parent 02617e1 commit 77a7307

File tree

36 files changed

+84
-84
lines changed

36 files changed

+84
-84
lines changed

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .221
2-
LINUX_KERNEL_HASH-5.4.221 = 27b37fc1fed7b4dcddf5a0a3730fabf25197c0ba13ace684481aa5444649df0a
1+
LINUX_VERSION-5.4 = .219
2+
LINUX_KERNEL_HASH-5.4.219 = 5293ad927269dfb697bc80e9dd95c1d9fd2e4bad7d8422300e012fd31950a261

‎target/linux/apm821xx/patches-5.4/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
1818

1919
--- a/arch/powerpc/boot/Makefile
2020
+++ b/arch/powerpc/boot/Makefile
21-
@@ -255,7 +255,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
21+
@@ -254,7 +254,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
2222

2323
# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
2424
quiet_cmd_wrap = WRAP $@

‎target/linux/generic/backport-5.4/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <[email protected]>
4141
if (b->sparse_flow_count + b->bulk_flow_count)
4242
empty = false;
4343

44-
@@ -2273,8 +2272,7 @@ static int cake_config_besteffort(struct
44+
@@ -2269,8 +2268,7 @@ static int cake_config_besteffort(struct
4545

4646
cake_set_rate(b, rate, mtu,
4747
us_to_ns(q->target), us_to_ns(q->interval));
@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <[email protected]>
5151

5252
return 0;
5353
}
54-
@@ -2285,8 +2283,7 @@ static int cake_config_precedence(struct
54+
@@ -2281,8 +2279,7 @@ static int cake_config_precedence(struct
5555
struct cake_sched_data *q = qdisc_priv(sch);
5656
u32 mtu = psched_mtu(qdisc_dev(sch));
5757
u64 rate = q->rate_bps;
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <[email protected]>
6161
u32 i;
6262

6363
q->tin_cnt = 8;
64-
@@ -2299,18 +2296,14 @@ static int cake_config_precedence(struct
64+
@@ -2295,18 +2292,14 @@ static int cake_config_precedence(struct
6565
cake_set_rate(b, rate, mtu, us_to_ns(q->target),
6666
us_to_ns(q->interval));
6767

@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <[email protected]>
8383
}
8484

8585
return 0;
86-
@@ -2379,8 +2372,7 @@ static int cake_config_diffserv8(struct
86+
@@ -2375,8 +2368,7 @@ static int cake_config_diffserv8(struct
8787
struct cake_sched_data *q = qdisc_priv(sch);
8888
u32 mtu = psched_mtu(qdisc_dev(sch));
8989
u64 rate = q->rate_bps;
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <[email protected]>
9393
u32 i;
9494

9595
q->tin_cnt = 8;
96-
@@ -2396,18 +2388,14 @@ static int cake_config_diffserv8(struct
96+
@@ -2392,18 +2384,14 @@ static int cake_config_diffserv8(struct
9797
cake_set_rate(b, rate, mtu, us_to_ns(q->target),
9898
us_to_ns(q->interval));
9999

@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <[email protected]>
115115
}
116116

117117
return 0;
118-
@@ -2446,17 +2434,11 @@ static int cake_config_diffserv4(struct
118+
@@ -2442,17 +2430,11 @@ static int cake_config_diffserv4(struct
119119
cake_set_rate(&q->tins[3], rate >> 2, mtu,
120120
us_to_ns(q->target), us_to_ns(q->interval));
121121

@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <[email protected]>
137137

138138
return 0;
139139
}
140-
@@ -2487,15 +2469,10 @@ static int cake_config_diffserv3(struct
140+
@@ -2483,15 +2465,10 @@ static int cake_config_diffserv3(struct
141141
cake_set_rate(&q->tins[2], rate >> 2, mtu,
142142
us_to_ns(q->target), us_to_ns(q->interval));
143143

‎target/linux/generic/hack-5.4/400-unlock_mx25l6406e_with_4bit_block_protect.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
ret = read_sr(nor);
3131
if (ret < 0) {
3232
dev_err(nor->dev, "error while reading status register\n");
33-
@@ -2338,7 +2345,7 @@ static const struct flash_info spi_nor_i
33+
@@ -2337,7 +2344,7 @@ static const struct flash_info spi_nor_i
3434
{ "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) },
3535
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
3636
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
@@ -39,7 +39,7 @@
3939
{ "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
4040
{ "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
4141
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
42-
@@ -5026,6 +5033,9 @@ int spi_nor_scan(struct spi_nor *nor, co
42+
@@ -5025,6 +5032,9 @@ int spi_nor_scan(struct spi_nor *nor, co
4343
if (info->flags & USE_CLSR)
4444
nor->flags |= SNOR_F_USE_CLSR;
4545

‎target/linux/generic/hack-5.4/721-phy_packets.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
5656
*/
5757
--- a/include/linux/skbuff.h
5858
+++ b/include/linux/skbuff.h
59-
@@ -2694,6 +2694,10 @@ static inline int pskb_trim(struct sk_bu
59+
@@ -2692,6 +2692,10 @@ static inline int pskb_trim(struct sk_bu
6060
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
6161
}
6262

@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
6767
/**
6868
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
6969
* @skb: buffer to alter
70-
@@ -2825,16 +2829,6 @@ static inline struct sk_buff *dev_alloc_
70+
@@ -2823,16 +2827,6 @@ static inline struct sk_buff *dev_alloc_
7171
}
7272

7373

‎target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
struct list_head *br_ip_list);
1313
--- a/include/linux/skbuff.h
1414
+++ b/include/linux/skbuff.h
15-
@@ -827,6 +827,10 @@ struct sk_buff {
15+
@@ -826,6 +826,10 @@ struct sk_buff {
1616
#endif
17-
__u8 scm_io_uring:1;
17+
__u8 gro_skip:1;
1818

1919
+#ifdef CONFIG_SHORTCUT_FE
2020
+ __u8 fast_forwarded:1;

‎target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle <[email protected]>
3030

3131
--- a/drivers/mtd/spi-nor/spi-nor.c
3232
+++ b/drivers/mtd/spi-nor/spi-nor.c
33-
@@ -2507,6 +2507,9 @@ static const struct flash_info spi_nor_i
33+
@@ -2506,6 +2506,9 @@ static const struct flash_info spi_nor_i
3434
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
3535
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
3636
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

‎target/linux/generic/pending-5.4/481-mtd-spi-nor-rework-broken-flash-reset-support.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Signed-off-by: Chuanhong Guo <[email protected]>
9191

9292
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
9393
return ret;
94-
@@ -2560,6 +2587,10 @@ static int spi_nor_read(struct mtd_info
94+
@@ -2559,6 +2586,10 @@ static int spi_nor_read(struct mtd_info
9595
if (ret)
9696
return ret;
9797

@@ -102,15 +102,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
102102
while (len) {
103103
loff_t addr = from;
104104

105-
@@ -2583,6 +2614,7 @@ static int spi_nor_read(struct mtd_info
105+
@@ -2582,6 +2613,7 @@ static int spi_nor_read(struct mtd_info
106106
ret = 0;
107107

108108
read_err:
109109
+ spi_nor_check_set_addr_width(nor, 0);
110110
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
111111
return ret;
112112
}
113-
@@ -2600,6 +2632,10 @@ static int sst_write(struct mtd_info *mt
113+
@@ -2599,6 +2631,10 @@ static int sst_write(struct mtd_info *mt
114114
if (ret)
115115
return ret;
116116

@@ -121,15 +121,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
121121
write_enable(nor);
122122

123123
nor->sst_write_second = false;
124-
@@ -2662,6 +2698,7 @@ static int sst_write(struct mtd_info *mt
124+
@@ -2661,6 +2697,7 @@ static int sst_write(struct mtd_info *mt
125125
}
126126
sst_write_err:
127127
*retlen += actual;
128128
+ spi_nor_check_set_addr_width(nor, 0);
129129
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
130130
return ret;
131131
}
132-
@@ -2684,6 +2721,10 @@ static int spi_nor_write(struct mtd_info
132+
@@ -2683,6 +2720,10 @@ static int spi_nor_write(struct mtd_info
133133
if (ret)
134134
return ret;
135135

@@ -140,15 +140,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
140140
for (i = 0; i < len; ) {
141141
ssize_t written;
142142
loff_t addr = to + i;
143-
@@ -2723,6 +2764,7 @@ static int spi_nor_write(struct mtd_info
143+
@@ -2722,6 +2763,7 @@ static int spi_nor_write(struct mtd_info
144144
}
145145

146146
write_err:
147147
+ spi_nor_check_set_addr_width(nor, 0);
148148
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
149149
return ret;
150150
}
151-
@@ -4727,9 +4769,13 @@ static int spi_nor_init(struct spi_nor *
151+
@@ -4726,9 +4768,13 @@ static int spi_nor_init(struct spi_nor *
152152
* reboots (e.g., crashes). Warn the user (or hopefully, system
153153
* designer) that this is bad.
154154
*/

‎target/linux/generic/pending-5.4/482-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Koen Vandeputte <[email protected]>
1010

1111
--- a/drivers/mtd/spi-nor/spi-nor.c
1212
+++ b/drivers/mtd/spi-nor/spi-nor.c
13-
@@ -2233,6 +2233,11 @@ static const struct flash_info spi_nor_i
13+
@@ -2232,6 +2232,11 @@ static const struct flash_info spi_nor_i
1414

1515
/* GigaDevice */
1616
{

‎target/linux/generic/pending-5.4/482-mtd-spi-nor-fix-4-byte-opcode-support-for-w25q256.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Signed-off-by: Mantas Pucka <[email protected]>
4848
/* NOTE: double check command sets and memory organization when you add
4949
* more nor chips. This current list focusses on newer chips, which
5050
* have been converging on command sets which including JEDEC ID.
51-
@@ -2516,7 +2542,8 @@ static const struct flash_info spi_nor_i
51+
@@ -2515,7 +2541,8 @@ static const struct flash_info spi_nor_i
5252
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
5353
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
5454
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },

‎target/linux/generic/pending-5.4/655-increase_skb_pad.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
99

1010
--- a/include/linux/skbuff.h
1111
+++ b/include/linux/skbuff.h
12-
@@ -2660,7 +2660,7 @@ static inline int pskb_network_may_pull(
12+
@@ -2658,7 +2658,7 @@ static inline int pskb_network_may_pull(
1313
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
1414
*/
1515
#ifndef NET_SKB_PAD

‎target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ Signed-off-by: Felix Fietkau <[email protected]>
2222
#endif
2323
--- a/include/linux/skbuff.h
2424
+++ b/include/linux/skbuff.h
25-
@@ -830,6 +830,7 @@ struct sk_buff {
26-
#ifdef CONFIG_NET_SCHED
27-
__u16 tc_index; /* traffic control index */
25+
@@ -824,6 +824,7 @@ struct sk_buff {
26+
#ifdef CONFIG_TLS_DEVICE
27+
__u8 decrypted:1;
2828
#endif
2929
+ __u8 gro_skip:1;
3030

31-
union {
32-
__wsum csum;
31+
#ifdef CONFIG_NET_SCHED
32+
__u16 tc_index; /* traffic control index */
3333
--- a/net/core/dev.c
3434
+++ b/net/core/dev.c
3535
@@ -5502,6 +5502,9 @@ static enum gro_result dev_gro_receive(s

‎target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Tudor Ambarus <[email protected]>
1818

1919
--- a/drivers/mtd/spi-nor/spi-nor.c
2020
+++ b/drivers/mtd/spi-nor/spi-nor.c
21-
@@ -2354,6 +2354,8 @@ static const struct flash_info spi_nor_i
21+
@@ -2353,6 +2353,8 @@ static const struct flash_info spi_nor_i
2222
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
2323
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
2424
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },

‎target/linux/ipq40xx/patches-5.4/305-spi-nor-add-en25qh16.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--- a/drivers/mtd/spi-nor/spi-nor.c
22
+++ b/drivers/mtd/spi-nor/spi-nor.c
3-
@@ -2243,6 +2243,8 @@ static const struct flash_info spi_nor_i
4-
{ "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, SECT_4K) },
3+
@@ -2242,6 +2242,8 @@ static const struct flash_info spi_nor_i
4+
{ "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) },
55
{ "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
66
SECT_4K | SPI_NOR_DUAL_READ) },
77
+ { "en25qh16", INFO(0x1c7015, 0, 64 * 1024, 32,

‎target/linux/ipq40xx/patches-5.4/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Robert Marko <[email protected]>
1414

1515
--- a/drivers/mmc/host/sdhci-msm.c
1616
+++ b/drivers/mmc/host/sdhci-msm.c
17-
@@ -1764,7 +1764,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
17+
@@ -1763,7 +1763,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
1818

1919
static const struct sdhci_ops sdhci_msm_ops = {
2020
.reset = sdhci_reset,

‎target/linux/ipq806x/patches-5.4/999-07a-qca-nss-drv-qdisc-support.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/include/linux/skbuff.h
22
+++ b/include/linux/skbuff.h
3-
@@ -817,6 +817,8 @@ struct sk_buff {
3+
@@ -816,6 +816,8 @@ struct sk_buff {
44
#ifdef CONFIG_NET_CLS_ACT
55
__u8 tc_skip_classify:1;
66
__u8 tc_at_ingress:1;

‎target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ Signed-off-by: Roy Pledge <[email protected]>
6363
* address space as memory. Needed when the kernel wants to execute
6464
--- a/arch/arm/mm/mmu.c
6565
+++ b/arch/arm/mm/mmu.c
66-
@@ -327,6 +327,13 @@ static struct mem_type mem_types[] __ro_
67-
#endif
66+
@@ -323,6 +323,13 @@ static struct mem_type mem_types[] __ro_
67+
.prot_sect = PMD_TYPE_SECT,
6868
.domain = DOMAIN_KERNEL,
6969
},
7070
+ [MT_MEMORY_RW_NS] = {
@@ -77,15 +77,15 @@ Signed-off-by: Roy Pledge <[email protected]>
7777
[MT_ROM] = {
7878
.prot_sect = PMD_TYPE_SECT,
7979
.domain = DOMAIN_KERNEL,
80-
@@ -667,6 +674,7 @@ static void __init build_mem_type_table(
80+
@@ -663,6 +670,7 @@ static void __init build_mem_type_table(
8181
}
8282
kern_pgprot |= PTE_EXT_AF;
8383
vecs_pgprot |= PTE_EXT_AF;
8484
+ mem_types[MT_MEMORY_RW_NS].prot_pte |= PTE_EXT_AF | cp->pte;
8585

8686
/*
8787
* Set PXN for user mappings
88-
@@ -695,6 +703,7 @@ static void __init build_mem_type_table(
88+
@@ -691,6 +699,7 @@ static void __init build_mem_type_table(
8989
mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
9090
mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
9191
mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;

‎target/linux/layerscape/patches-5.4/303-core-0001-net-readd-skb_recycle.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Madalin Bucur <[email protected]>
1414

1515
--- a/include/linux/skbuff.h
1616
+++ b/include/linux/skbuff.h
17-
@@ -1031,6 +1031,7 @@ void skb_dump(const char *level, const s
17+
@@ -1029,6 +1029,7 @@ void skb_dump(const char *level, const s
1818
void skb_tx_error(struct sk_buff *skb);
1919
void consume_skb(struct sk_buff *skb);
2020
void __consume_stateless_skb(struct sk_buff *skb);

‎target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Kuldeep Singh <[email protected]>
1111

1212
--- a/drivers/mtd/spi-nor/spi-nor.c
1313
+++ b/drivers/mtd/spi-nor/spi-nor.c
14-
@@ -2420,7 +2420,7 @@ static const struct flash_info spi_nor_i
14+
@@ -2419,7 +2419,7 @@ static const struct flash_info spi_nor_i
1515
{ "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
1616
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
1717
SPI_NOR_HAS_LOCK | USE_CLSR) },

‎target/linux/layerscape/patches-5.4/819-uart-0001-tty-serial-lpuart-add-power-domain-support.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Signed-off-by: Fugang Duan <[email protected]>
2727
#include <linux/serial_core.h>
2828
#include <linux/slab.h>
2929
#include <linux/tty_flip.h>
30-
@@ -2394,6 +2396,54 @@ static struct uart_driver lpuart_reg = {
30+
@@ -2392,6 +2394,54 @@ static struct uart_driver lpuart_reg = {
3131
.cons = LPUART_CONSOLE,
3232
};
3333

@@ -82,7 +82,7 @@ Signed-off-by: Fugang Duan <[email protected]>
8282
static int lpuart_probe(struct platform_device *pdev)
8383
{
8484
const struct of_device_id *of_id = of_match_device(lpuart_dt_ids,
85-
@@ -2431,6 +2481,10 @@ static int lpuart_probe(struct platform_
85+
@@ -2429,6 +2479,10 @@ static int lpuart_probe(struct platform_
8686

8787
sport->port.rs485_config = lpuart_config_rs485;
8888

‎target/linux/layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,9 @@ Signed-off-by: Fugang Duan <[email protected]>
483483
- del_timer_sync(&sport->lpuart_timer);
484484
+ lpuart_del_timer_sync(sport);
485485
lpuart_dma_rx_free(&sport->port);
486-
sport->lpuart_dma_rx_use = false;
487486
}
488-
@@ -1651,11 +1796,22 @@ static void lpuart32_shutdown(struct uar
487+
488+
@@ -1649,11 +1794,22 @@ static void lpuart32_shutdown(struct uar
489489

490490
spin_lock_irqsave(&port->lock, flags);
491491

@@ -510,7 +510,7 @@ Signed-off-by: Fugang Duan <[email protected]>
510510

511511
spin_unlock_irqrestore(&port->lock, flags);
512512

513-
@@ -1752,10 +1908,10 @@ lpuart_set_termios(struct uart_port *por
513+
@@ -1750,10 +1906,10 @@ lpuart_set_termios(struct uart_port *por
514514
* baud rate and restart Rx DMA path.
515515
*
516516
* Since timer function acqures sport->port.lock, need to stop before
@@ -523,7 +523,7 @@ Signed-off-by: Fugang Duan <[email protected]>
523523
lpuart_dma_rx_free(&sport->port);
524524
}
525525

526-
@@ -1967,10 +2123,10 @@ lpuart32_set_termios(struct uart_port *p
526+
@@ -1965,10 +2121,10 @@ lpuart32_set_termios(struct uart_port *p
527527
* baud rate and restart Rx DMA path.
528528
*
529529
* Since timer function acqures sport->port.lock, need to stop before
@@ -536,7 +536,7 @@ Signed-off-by: Fugang Duan <[email protected]>
536536
lpuart_dma_rx_free(&sport->port);
537537
}
538538

539-
@@ -2483,6 +2639,10 @@ static int lpuart_probe(struct platform_
539+
@@ -2481,6 +2637,10 @@ static int lpuart_probe(struct platform_
540540
sport->port.dev = &pdev->dev;
541541
sport->port.type = PORT_LPUART;
542542
sport->devtype = sdata->devtype;
@@ -547,7 +547,7 @@ Signed-off-by: Fugang Duan <[email protected]>
547547
ret = platform_get_irq(pdev, 0);
548548
if (ret < 0)
549549
return ret;
550-
@@ -2633,7 +2793,7 @@ static int lpuart_suspend(struct device
550+
@@ -2631,7 +2791,7 @@ static int lpuart_suspend(struct device
551551
* Rx DMA path before suspend and start Rx DMA path on resume.
552552
*/
553553
if (irq_wake) {

0 commit comments

Comments
 (0)