diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-06-05 05:35:47 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2018-06-05 15:27:36 +0200 |
| commit | 187da94808a634477b5e5a69109ea0c566dfa64b (patch) | |
| tree | 44cd192e639cdb11eea33d981addd29cf6f910fb /target/linux/generic | |
| parent | 2f3b1dddeaef82ed8c69d697570ece5bd903f702 (diff) | |
| download | upstream-187da94808a634477b5e5a69109ea0c566dfa64b.tar.gz upstream-187da94808a634477b5e5a69109ea0c566dfa64b.tar.bz2 upstream-187da94808a634477b5e5a69109ea0c566dfa64b.zip | |
kernel: modules: package module for Exar 8250 UARTs
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/pending-4.14/950-tty-serial-exar-generalize-rs485-setup.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.14/950-tty-serial-exar-generalize-rs485-setup.patch b/target/linux/generic/pending-4.14/950-tty-serial-exar-generalize-rs485-setup.patch new file mode 100644 index 0000000000..a2b740fd42 --- /dev/null +++ b/target/linux/generic/pending-4.14/950-tty-serial-exar-generalize-rs485-setup.patch @@ -0,0 +1,81 @@ +From 24d5ba8ad40c3ac7903f688580c345aafa764dc7 Mon Sep 17 00:00:00 2001 +From: Daniel Golle <daniel@makrotopia.org> +Date: Mon, 4 Jun 2018 14:51:29 +0200 +Subject: [PATCH] tty: serial: exar: generalize rs485 setup +To: linux-serial@vger.kernel.org, + Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Cc: Linus Walleij <linus.walleij@linaro.org>, + Jan Kiszka <jan.kiszka@siemens.com> + +Move the non-board-specific part of the RS485 initialization +from iot2040_rs485_config function to a new generic function +used also for other boards. +This allows using PCIe boards which are hard-wired to RS485 +or have jumpers for their configurations. + +Signed-off-by: Daniel Golle <daniel@makrotopia.org> +--- + drivers/tty/serial/8250/8250_exar.c | 38 +++++++++++++++++++---------- + 1 file changed, 25 insertions(+), 13 deletions(-) + +diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c +index e0aa5f03004c..55b4d6d581f0 100644 +--- a/drivers/tty/serial/8250/8250_exar.c ++++ b/drivers/tty/serial/8250/8250_exar.c +@@ -275,8 +275,32 @@ static int xr17v35x_register_gpio(struct pci_dev *pcidev, + return 0; + } + ++static int generic_rs485_config(struct uart_port *port, ++ struct serial_rs485 *rs485) ++{ ++ bool is_rs485 = !!(rs485->flags & SER_RS485_ENABLED); ++ u8 __iomem *p = port->membase; ++ u8 value; ++ ++ value = readb(p + UART_EXAR_FCTR); ++ if (is_rs485) ++ value |= UART_FCTR_EXAR_485; ++ else ++ value &= ~UART_FCTR_EXAR_485; ++ ++ writeb(value, p + UART_EXAR_FCTR); ++ ++ if (is_rs485) ++ writeb(UART_EXAR_RS485_DLY(4), p + UART_MSR); ++ ++ port->rs485 = *rs485; ++ ++ return 0; ++} ++ + static const struct exar8250_platform exar8250_default_platform = { + .register_gpio = xr17v35x_register_gpio, ++ .rs485_config = generic_rs485_config, + }; + + static int iot2040_rs485_config(struct uart_port *port, +@@ -309,19 +333,7 @@ static int iot2040_rs485_config(struct uart_port *port, + value |= mode; + writeb(value, p + UART_EXAR_MPIOLVL_7_0); + +- value = readb(p + UART_EXAR_FCTR); +- if (is_rs485) +- value |= UART_FCTR_EXAR_485; +- else +- value &= ~UART_FCTR_EXAR_485; +- writeb(value, p + UART_EXAR_FCTR); +- +- if (is_rs485) +- writeb(UART_EXAR_RS485_DLY(4), p + UART_MSR); +- +- port->rs485 = *rs485; +- +- return 0; ++ return generic_rs485_config(port, rs485); + } + + static const struct property_entry iot2040_gpio_properties[] = { +-- +2.17.1 + |