[openwrt/openwrt] bmips: remove unneeded downstream serial patch

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 23 06:36:43 EST 2021


noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f0d5eb149efbdf28c859725927906eac3a4087f1

commit f0d5eb149efbdf28c859725927906eac3a4087f1
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Tue Feb 23 12:34:27 2021 +0100

    bmips: remove unneeded downstream serial patch
    
    Disabling CONFIG_SERIAL_8250 makes the upstream serial driver work OOB.
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 target/linux/bmips/config-5.10                                |  2 +-
 .../patches-5.10/201-serial-bcm63xx-init-uart-earlier.patch   | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/target/linux/bmips/config-5.10 b/target/linux/bmips/config-5.10
index e8386fa690..86c71aaeef 100644
--- a/target/linux/bmips/config-5.10
+++ b/target/linux/bmips/config-5.10
@@ -213,9 +213,9 @@ CONFIG_RESET_BCM6345=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
+# CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
-CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SMP=y
 CONFIG_SMP_UP=y
diff --git a/target/linux/bmips/patches-5.10/201-serial-bcm63xx-init-uart-earlier.patch b/target/linux/bmips/patches-5.10/201-serial-bcm63xx-init-uart-earlier.patch
deleted file mode 100644
index 468f89d0b5..0000000000
--- a/target/linux/bmips/patches-5.10/201-serial-bcm63xx-init-uart-earlier.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/tty/serial/bcm63xx_uart.c
-+++ b/drivers/tty/serial/bcm63xx_uart.c
-@@ -916,7 +916,7 @@ static void __exit bcm_uart_exit(void)
- 	uart_unregister_driver(&bcm_uart_driver);
- }
- 
--module_init(bcm_uart_init);
-+subsys_initcall(bcm_uart_init);
- module_exit(bcm_uart_exit);
- 
- MODULE_AUTHOR("Maxime Bizon <mbizon at freebox.fr>");



More information about the lede-commits mailing list