aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2021-02-23 12:34:27 +0100
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-02-23 12:35:52 +0100
commitf0d5eb149efbdf28c859725927906eac3a4087f1 (patch)
tree8e255f2afda9e5db63606fd1d404f577c99ba3e5
parent50cb3a750f96c4a0f97602b7242068e9bb239fc4 (diff)
downloadupstream-f0d5eb149efbdf28c859725927906eac3a4087f1.tar.gz
upstream-f0d5eb149efbdf28c859725927906eac3a4087f1.tar.bz2
upstream-f0d5eb149efbdf28c859725927906eac3a4087f1.zip
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@gmail.com>
-rw-r--r--target/linux/bmips/config-5.102
-rw-r--r--target/linux/bmips/patches-5.10/201-serial-bcm63xx-init-uart-earlier.patch11
2 files changed, 1 insertions, 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@freebox.fr>");