Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 6b06f19151c335ee0c5b61839fa4e6838182ebb8

Authored by David Daney
Committed by Linus Torvalds
1 parent 8e23fcc89c

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: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 9 additions and 1 deletions Side-by-side Diff

drivers/serial/8250.c
Diff comments   View file @ 6b06f19
... ... @@ -279,6 +279,13 @@
279 279 .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
280 280 .flags = UART_CAP_FIFO,
281 281 },
  282 + [PORT_OCTEON] = {
  283 + .name = "OCTEON",
  284 + .fifo_size = 64,
  285 + .tx_loadsz = 64,
  286 + .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
  287 + .flags = UART_CAP_FIFO,
  288 + },
282 289 };
283 290  
284 291 #if defined (CONFIG_SERIAL_8250_AU1X00)
include/linux/serial_core.h
Diff comments   View file @ 6b06f19
... ... @@ -40,7 +40,8 @@
40 40 #define PORT_NS16550A 14
41 41 #define PORT_XSCALE 15
42 42 #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
43   -#define PORT_MAX_8250 16 /* max port ID */
  43 +#define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
  44 +#define PORT_MAX_8250 17 /* max port ID */
44 45  
45 46 /*
46 47 * ARM specific type numbers. These are not currently guaranteed