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

Commit 6b06f191 authored by David Daney's avatar David Daney Committed by Linus Torvalds
Browse files

Serial: UART driver changes for Cavium OCTEON. 



Cavium UART implementation is not covered by existing uart_configS.
Define a new uart_config (PORT_OCTEON) which is specified by OCTEON
platform device registration code.

Signed-off-by: default avatarTomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e23fcc8

drivers/serial/8250.c

+7 −0
Original line number Diff line number Diff line
@@ -279,6 +279,13 @@ static const struct serial8250_config uart_config[] = { 
		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,

		.flags		= UART_CAP_FIFO,

	},

	[PORT_OCTEON] = {

		.name		= "OCTEON",

		.fifo_size	= 64,

		.tx_loadsz	= 64,

		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,

		.flags		= UART_CAP_FIFO,

	},

};



#if defined (CONFIG_SERIAL_8250_AU1X00)

include/linux/serial_core.h

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ 
#define PORT_NS16550A	14

#define PORT_XSCALE	15

#define PORT_RM9000	16	/* PMC-Sierra RM9xxx internal UART */

#define PORT_MAX_8250	16	/* max port ID */

#define PORT_OCTEON	17	/* Cavium OCTEON internal UART */

#define PORT_MAX_8250	17	/* max port ID */



/*

 * ARM specific type numbers.  These are not currently guaranteed