Skip to content

Commit b36db4e

Browse files
committed
kernel: refresh 5.15 patches (#11715)
1 parent fae6bc8 commit b36db4e

75 files changed

Lines changed: 153 additions & 231 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use the same logic.
1414

1515
--- a/drivers/tty/serial/amba-pl011.c
1616
+++ b/drivers/tty/serial/amba-pl011.c
17-
@@ -2756,7 +2756,12 @@ static int pl011_setup_port(struct devic
17+
@@ -2752,7 +2752,12 @@ static int pl011_setup_port(struct devic
1818
if (IS_ERR(base))
1919
return PTR_ERR(base);
2020

target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
2626

2727
--- a/drivers/tty/serial/amba-pl011.c
2828
+++ b/drivers/tty/serial/amba-pl011.c
29-
@@ -1730,6 +1730,23 @@ static void pl011_put_poll_char(struct u
29+
@@ -1726,6 +1726,23 @@ static void pl011_put_poll_char(struct u
3030

3131
#endif /* CONFIG_CONSOLE_POLL */
3232

@@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5050
static int pl011_hwinit(struct uart_port *port)
5151
{
5252
struct uart_amba_port *uap =
53-
@@ -1746,7 +1763,7 @@ static int pl011_hwinit(struct uart_port
53+
@@ -1742,7 +1759,7 @@ static int pl011_hwinit(struct uart_port
5454
if (retval)
5555
return retval;
5656

@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5959

6060
/* Clear pending error and receive interrupts */
6161
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
62-
@@ -2452,7 +2469,7 @@ static int pl011_console_setup(struct co
62+
@@ -2448,7 +2465,7 @@ static int pl011_console_setup(struct co
6363
plat->init();
6464
}
6565

@@ -68,15 +68,15 @@ Signed-off-by: Phil Elwell <[email protected]>
6868

6969
if (uap->vendor->fixed_options) {
7070
baud = uap->fixed_baud;
71-
@@ -2669,6 +2686,7 @@ static struct uart_driver amba_reg = {
71+
@@ -2665,6 +2682,7 @@ static struct uart_driver amba_reg = {
7272
.cons = AMBA_CONSOLE,
7373
};
7474

7575
+#if 0
7676
static int pl011_probe_dt_alias(int index, struct device *dev)
7777
{
7878
struct device_node *np;
79-
@@ -2700,6 +2718,7 @@ static int pl011_probe_dt_alias(int inde
79+
@@ -2696,6 +2714,7 @@ static int pl011_probe_dt_alias(int inde
8080

8181
return ret;
8282
}

target/linux/bcm27xx/patches-5.15/950-0058-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1717

1818
--- a/drivers/tty/serial/amba-pl011.c
1919
+++ b/drivers/tty/serial/amba-pl011.c
20-
@@ -1435,6 +1435,7 @@ static bool pl011_tx_char(struct uart_am
20+
@@ -1431,6 +1431,7 @@ static bool pl011_tx_char(struct uart_am
2121
return false; /* unable to transmit character */
2222

2323
pl011_write(c, uap, REG_DR);

target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3636
- reg
3737
--- a/drivers/tty/serial/amba-pl011.c
3838
+++ b/drivers/tty/serial/amba-pl011.c
39-
@@ -2847,6 +2847,11 @@ static int pl011_probe(struct amba_devic
39+
@@ -2843,6 +2843,11 @@ static int pl011_probe(struct amba_devic
4040
if (IS_ERR(uap->clk))
4141
return PTR_ERR(uap->clk);
4242

target/linux/bcm27xx/patches-5.15/950-0061-tty-amba-pl011-Avoid-rare-write-when-full-error.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <[email protected]>
2929

3030
--- a/drivers/tty/serial/amba-pl011.c
3131
+++ b/drivers/tty/serial/amba-pl011.c
32-
@@ -1496,6 +1496,10 @@ static bool pl011_tx_chars(struct uart_a
32+
@@ -1492,6 +1492,10 @@ static bool pl011_tx_chars(struct uart_a
3333
if (likely(from_irq) && count-- == 0)
3434
break;
3535

target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
244244
static inline int mmc_blk_part_switch(struct mmc_card *card,
245245
unsigned int part_type);
246246
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
247-
@@ -2942,6 +2949,8 @@ static int mmc_blk_probe(struct mmc_card
247+
@@ -2944,6 +2951,8 @@ static int mmc_blk_probe(struct mmc_card
248248
{
249249
struct mmc_blk_data *md;
250250
int ret = 0;
@@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
253253

254254
/*
255255
* Check that the card supports the command class(es) we need.
256-
@@ -2949,7 +2958,16 @@ static int mmc_blk_probe(struct mmc_card
256+
@@ -2951,7 +2960,16 @@ static int mmc_blk_probe(struct mmc_card
257257
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
258258
return -ENODEV;
259259

@@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
271271

272272
card->complete_wq = alloc_workqueue("mmc_complete",
273273
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
274-
@@ -2964,6 +2982,17 @@ static int mmc_blk_probe(struct mmc_card
274+
@@ -2966,6 +2984,17 @@ static int mmc_blk_probe(struct mmc_card
275275
goto out_free;
276276
}
277277

@@ -291,7 +291,7 @@ bcm2835-mmc: uninitialized_var is no more
291291
goto out;
292292
--- a/drivers/mmc/core/core.c
293293
+++ b/drivers/mmc/core/core.c
294-
@@ -1812,7 +1812,8 @@ EXPORT_SYMBOL(mmc_erase);
294+
@@ -1817,7 +1817,8 @@ EXPORT_SYMBOL(mmc_erase);
295295

296296
int mmc_can_erase(struct mmc_card *card)
297297
{

target/linux/bcm27xx/patches-5.15/950-0108-sc16is7xx-Don-t-spin-if-no-data-received.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Signed-off-by: Phil Elwell <[email protected]>
1212

1313
--- a/drivers/tty/serial/sc16is7xx.c
1414
+++ b/drivers/tty/serial/sc16is7xx.c
15-
@@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc
16-
rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
15+
@@ -708,6 +708,8 @@ static bool sc16is7xx_port_irq(struct sc
16+
1717
if (rxlen)
1818
sc16is7xx_handle_rx(port, rxlen, iir);
1919
+ else

target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
3333
#define USB_VENDOR_ID_BELKIN 0x050d
3434
#define USB_DEVICE_ID_FLIP_KVM 0x3201
3535

36-
@@ -1318,6 +1321,9 @@
36+
@@ -1319,6 +1322,9 @@
3737
#define USB_VENDOR_ID_XAT 0x2505
3838
#define USB_DEVICE_ID_XAT_CSR 0x0220
3939

@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
5353
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
5454
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
5555
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
56-
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
56+
@@ -199,6 +200,7 @@ static const struct hid_device_id hid_qu
5757
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
5858
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
5959
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },

target/linux/bcm27xx/patches-5.15/950-0231-sc16is7xx-Fix-for-hardware-flow-control.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3838
regcache_cache_bypass(s->regmap, false);
3939

4040
/* Put LCR back to the normal mode */
41-
@@ -842,7 +843,7 @@ static unsigned int sc16is7xx_get_mctrl(
41+
@@ -854,7 +855,7 @@ static unsigned int sc16is7xx_get_mctrl(
4242
/* DCD and DSR are not wired and CTS/RTS is handled automatically
4343
* so just indicate DSR and CAR asserted
4444
*/
@@ -47,7 +47,7 @@ Signed-off-by: Phil Elwell <[email protected]>
4747
}
4848

4949
static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)
50-
@@ -929,14 +930,19 @@ static void sc16is7xx_set_termios(struct
50+
@@ -941,14 +942,19 @@ static void sc16is7xx_set_termios(struct
5151
regcache_cache_bypass(s->regmap, true);
5252
sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]);
5353
sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]);

target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <[email protected]>
2525

2626
--- a/MAINTAINERS
2727
+++ b/MAINTAINERS
28-
@@ -17523,6 +17523,14 @@ T: git git://linuxtv.org/media_tree.git
28+
@@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git
2929
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
3030
F: drivers/media/i2c/imx412.c
3131

0 commit comments

Comments
 (0)