Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef4e281e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_exar: Extract PM routine from 8250_port 



There are Exar quirks in 8250_port which belong to 8250_exar module.
Extract PM routine to the correct module and do not contaminate generic code
with it.

Cc: Aaron Sierra <asierra@xes-inc.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190731170558.52897-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6be254c2

drivers/tty/serial/8250/8250_exar.c

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


#define UART_EXAR_INT0		0x80

#define UART_EXAR_8XMODE	0x88	/* 8X sampling rate select */

#define UART_EXAR_SLEEP		0x8b	/* Sleep mode */

#define UART_EXAR_DVID		0x8d	/* Device identification */



#define UART_EXAR_FCTR		0x08	/* Feature Control Register */
@@ -128,6 +129,17 @@ struct exar8250 { 
	int			line[0];

};



static void exar_pm(struct uart_port *port, unsigned int state, unsigned int old)

{

	/*

	 * Exar UARTs have a SLEEP register that enables or disables each UART

	 * to enter sleep mode separately. On the XR17V35x the register

	 * is accessible to each UART at the UART_EXAR_SLEEP offset, but

	 * the UART channel may only write to the corresponding bit.

	 */

	serial_port_out(port, UART_EXAR_SLEEP, state ? 0xff : 0);

}



static int default_setup(struct exar8250 *priv, struct pci_dev *pcidev,

			 int idx, unsigned int offset,

			 struct uart_8250_port *port)
@@ -155,6 +167,8 @@ static int default_setup(struct exar8250 *priv, struct pci_dev *pcidev, 
		port->port.type = PORT_XR17D15X;

	}



	port->port.pm = exar_pm;



	return 0;

}

drivers/tty/serial/8250/8250_port.c

+2 −14
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
 * These are definitions for the Exar XR17V35X and XR17(C|D)15X

 */

#define UART_EXAR_INT0		0x80

#define UART_EXAR_SLEEP		0x8b	/* Sleep mode */



/* Nuvoton NPCM timeout register */

#define UART_NPCM_TOR          7
@@ -708,19 +707,8 @@ EXPORT_SYMBOL_GPL(serial8250_rpm_put_tx); 
static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)

{

	unsigned char lcr = 0, efr = 0;

	/*

	 * Exar UARTs have a SLEEP register that enables or disables

	 * each UART to enter sleep mode separately.  On the XR17V35x the

	 * register is accessible to each UART at the UART_EXAR_SLEEP

	 * offset but the UART channel may only write to the corresponding

	 * bit.

	 */



	serial8250_rpm_get(p);

	if ((p->port.type == PORT_XR17V35X) ||

	   (p->port.type == PORT_XR17D15X)) {

		serial_out(p, UART_EXAR_SLEEP, sleep ? 0xff : 0);

		goto out;

	}



	if (p->capabilities & UART_CAP_SLEEP) {

		if (p->capabilities & UART_CAP_EFR) {
@@ -737,7 +725,7 @@ static void serial8250_set_sleep(struct uart_8250_port *p, int sleep) 
			serial_out(p, UART_LCR, lcr);

		}

	}

out:



	serial8250_rpm_put(p);

}