From: Álvaro Fernández Rojas Date: Tue, 23 Feb 2021 11:34:27 +0000 (+0100) Subject: bmips: remove unneeded downstream serial patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f0d5eb149efbdf28c859725927906eac3a4087f1;p=openwrt%2Fstaging%2Fjow.git bmips: remove unneeded downstream serial patch Disabling CONFIG_SERIAL_8250 makes the upstream serial driver work OOB. Signed-off-by: Álvaro Fernández Rojas --- 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 ");