kernel: bump 5.15 to 5.15.50

Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
musashino-build · Jul 3, 2022 · 90a6350 · 90a6350
1 parent 06d0cc2
commit 90a6350
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .49
-LINUX_KERNEL_HASH-5.15.49 = 32497893ba47f4ad32a59fa4254e8c25e41bc821798e3b2f2443822fa00059dc
+LINUX_VERSION-5.15 = .50
+LINUX_KERNEL_HASH-5.15.50 = 554d507d37a23810fe8c83912761e4a4f73c40794bc685ff7ca98042fe1bd70f
diff --git a/...t/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/...t/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
@@ -14,7 +14,7 @@ use the same logic.
 
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2738,7 +2738,12 @@ static int pl011_setup_port(struct devic
+@@ -2725,7 +2725,12 @@ static int pl011_setup_port(struct devic
  	if (IS_ERR(base))
  		return PTR_ERR(base);
 

diff --git a/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch b/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1725,6 +1725,23 @@ static void pl011_put_poll_char(struct u
+@@ -1718,6 +1718,23 @@ static void pl011_put_poll_char(struct u
 
  #endif /* CONFIG_CONSOLE_POLL */
 
@@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static int pl011_hwinit(struct uart_port *port)
  {
  	struct uart_amba_port *uap =
-@@ -1741,7 +1758,7 @@ static int pl011_hwinit(struct uart_port
+@@ -1734,7 +1751,7 @@ static int pl011_hwinit(struct uart_port
  	if (retval)
  		return retval;
 
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
  	/* Clear pending error and receive interrupts */
  	pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
-@@ -2434,7 +2451,7 @@ static int pl011_console_setup(struct co
+@@ -2421,7 +2438,7 @@ static int pl011_console_setup(struct co
  			plat->init();
  	}
 
@@ -68,15 +68,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
  	if (uap->vendor->fixed_options) {
  		baud = uap->fixed_baud;
-@@ -2651,6 +2668,7 @@ static struct uart_driver amba_reg = {
+@@ -2638,6 +2655,7 @@ static struct uart_driver amba_reg = {
  	.cons			= AMBA_CONSOLE,
  };
 
 +#if 0
  static int pl011_probe_dt_alias(int index, struct device *dev)
  {
  	struct device_node *np;
-@@ -2682,6 +2700,7 @@ static int pl011_probe_dt_alias(int inde
+@@ -2669,6 +2687,7 @@ static int pl011_probe_dt_alias(int inde
 
  	return ret;
  }

diff --git a/...linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch b/...linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
    - reg
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2829,6 +2829,11 @@ static int pl011_probe(struct amba_devic
+@@ -2816,6 +2816,11 @@ static int pl011_probe(struct amba_devic
  	if (IS_ERR(uap->clk))
  		return PTR_ERR(uap->clk);
 

diff --git a/target/linux/bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch b/target/linux/bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch
@@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static void pl011_stop_rx(struct uart_port *port)
  {
  	struct uart_amba_port *uap =
-@@ -2276,6 +2302,8 @@ static const struct uart_ops amba_pl011_
+@@ -2263,6 +2289,8 @@ static const struct uart_ops amba_pl011_
  	.stop_tx	= pl011_stop_tx,
  	.start_tx	= pl011_start_tx,
  	.stop_rx	= pl011_stop_rx,

diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
@@ -14,15 +14,15 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3293,6 +3293,7 @@ static const struct net_device_ops mtk_n
+@@ -3290,6 +3290,7 @@ static const struct net_device_ops mtk_n
 
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {
 +	const char *name = of_get_property(np, "label", NULL);
  	const __be32 *_id = of_get_property(np, "reg", NULL);
  	phy_interface_t phy_mode;
  	struct phylink *phylink;
-@@ -3388,6 +3389,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3385,6 +3386,9 @@ static int mtk_add_mac(struct mtk_eth *e
  	else
  		eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
 

diff --git a/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c
-@@ -401,6 +401,9 @@ uart_get_baud_rate(struct uart_port *por
+@@ -393,6 +393,9 @@ uart_get_baud_rate(struct uart_port *por
  		break;
  	}