Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

serial: 8250_of: Drop quirk fot NPCM from 8250_port

Browse Source 
We are not supposed to spread quirks in 8250_port module especially
when we have a separate driver for the hardware in question.

Move quirk from generic module to the driver that uses it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240215145029.581389-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2024-02-15 16:50:08 +02:00 committed by Greg Kroah-Hartman
parent 5fcd6e71e8
commit cd0eb354d4
2 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/tty/serial/8250/8250_of.c
View File

@ -4,7 +4,10 @@
* *
* Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp. * Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp.
*/ */
#include <linux/bits.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/math.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
@ -25,6 +28,36 @@ struct of_serial_info {
int line; int line;
}; };
/* Nuvoton NPCM timeout register */
#define UART_NPCM_TOR 7
#define UART_NPCM_TOIE BIT(7) /* Timeout Interrupt Enable */
static int npcm_startup(struct uart_port *port)
{
/*
* Nuvoton calls the scratch register 'UART_TOR' (timeout
* register). Enable it, and set TIOC (timeout interrupt
* comparator) to be 0x20 for correct operation.
*/
serial_port_out(port, UART_NPCM_TOR, UART_NPCM_TOIE | 0x20);
return serial8250_do_startup(port);
}
/* Nuvoton NPCM UARTs have a custom divisor calculation */
static unsigned int npcm_get_divisor(struct uart_port *port, unsigned int baud,
unsigned int *frac)
{
return DIV_ROUND_CLOSEST(port->uartclk, 16 * baud + 2) - 2;
}
static int npcm_setup(struct uart_port *port)
{
port->get_divisor = npcm_get_divisor;
port->startup = npcm_startup;
return 0;
}
/* /*
* Fill a struct uart_port for a given device node * Fill a struct uart_port for a given device node
*/ */
@ -164,10 +197,17 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
switch (type) { switch (type) {
case PORT_RT2880: case PORT_RT2880:
ret = rt288x_setup(port); ret = rt288x_setup(port);
if (ret) break;
goto err_pmruntime; case PORT_NPCM:
ret = npcm_setup(port);
break;
default:
/* Nothing to do */
ret = 0;
break; break;
} }
if (ret)
goto err_pmruntime;
if (IS_REACHABLE(CONFIG_SERIAL_8250_FSL) && if (IS_REACHABLE(CONFIG_SERIAL_8250_FSL) &&
(of_device_is_compatible(np, "fsl,ns16550") || (of_device_is_compatible(np, "fsl,ns16550") ||

24
drivers/tty/serial/8250/8250_port.c
View File

@ -38,10 +38,6 @@
#include "8250.h" #include "8250.h"
/* Nuvoton NPCM timeout register */
#define UART_NPCM_TOR 7
#define UART_NPCM_TOIE BIT(7) /* Timeout Interrupt Enable */
/* /*
* Debugging. * Debugging.
*/ */
@ -2235,15 +2231,6 @@ int serial8250_do_startup(struct uart_port *port)
UART_DA830_PWREMU_MGMT_FREE); UART_DA830_PWREMU_MGMT_FREE);
} }
if (port->type == PORT_NPCM) {
/*
* Nuvoton calls the scratch register 'UART_TOR' (timeout
* register). Enable it, and set TIOC (timeout interrupt
* comparator) to be 0x20 for correct operation.
*/
serial_port_out(port, UART_NPCM_TOR, UART_NPCM_TOIE | 0x20);
}
#ifdef CONFIG_SERIAL_8250_RSA #ifdef CONFIG_SERIAL_8250_RSA
/* /*
* If this is an RSA port, see if we can kick it up to the * If this is an RSA port, see if we can kick it up to the
@ -2545,15 +2532,6 @@ static void serial8250_shutdown(struct uart_port *port)
serial8250_do_shutdown(port); serial8250_do_shutdown(port);
} }
/* Nuvoton NPCM UARTs have a custom divisor calculation */
static unsigned int npcm_get_divisor(struct uart_8250_port *up,
unsigned int baud)
{
struct uart_port *port = &up->port;
return DIV_ROUND_CLOSEST(port->uartclk, 16 * baud + 2) - 2;
}
static unsigned int serial8250_do_get_divisor(struct uart_port *port, static unsigned int serial8250_do_get_divisor(struct uart_port *port,
unsigned int baud, unsigned int baud,
unsigned int *frac) unsigned int *frac)
@ -2598,8 +2576,6 @@ static unsigned int serial8250_do_get_divisor(struct uart_port *port,
quot = 0x8001; quot = 0x8001;
else if (magic_multiplier && baud >= port->uartclk / 12) else if (magic_multiplier && baud >= port->uartclk / 12)
quot = 0x8002; quot = 0x8002;
else if (up->port.type == PORT_NPCM)
quot = npcm_get_divisor(up, baud);
else else
quot = uart_get_divisor(port, baud); quot = uart_get_divisor(port, baud);