Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325567
b: refs/heads/master
c: 596f93f
h: refs/heads/master
i:
  325565: fe08f52
  325563: 40b3418
  325559: 7d4d017
  325551: 0e0f7dd
  325535: ceb9aa3
  325503: 7aa9e09
v: v3
  • Loading branch information
Roland Stigge authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 049cec9 commit cf75ad9
Show file tree
Hide file tree
Showing 5 changed files with 858 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4305f0c500cc2b8ca8d6ca2fb74fb76bf2cb6ad
refs/heads/master: 596f93f50e2d1a926bbb6c73aa7ee7fd862b7062
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
* NXP LPC32xx SoC High Speed UART

Required properties:
- compatible: Should be "nxp,lpc3220-hsuart"
- reg: Should contain registers location and length
- interrupts: Should contain interrupt

Example:

uart1: serial@40014000 {
compatible = "nxp,lpc3220-hsuart";
reg = <0x40014000 0x1000>;
interrupts = <26 0>;
};
19 changes: 19 additions & 0 deletions trunk/drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,25 @@ config SERIAL_PNX8XXX_CONSOLE
If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
and you want to use serial console, say Y. Otherwise, say N.

config SERIAL_HS_LPC32XX
tristate "LPC32XX high speed serial port support"
depends on ARCH_LPC32XX && OF
select SERIAL_CORE
help
Support for the LPC32XX high speed serial ports (up to 900kbps).
Those are UARTs completely different from the Standard UARTs on the
LPC32XX SoC.
Choose M or Y here to build this driver.

config SERIAL_HS_LPC32XX_CONSOLE
bool "Enable LPC32XX high speed UART serial console"
depends on SERIAL_HS_LPC32XX
select SERIAL_CORE_CONSOLE
help
If you would like to be able to use one of the high speed serial
ports on the LPC32XX as the console, you can do so by answering
Y to this option.

config SERIAL_CORE
tristate

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/tty/serial/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
obj-$(CONFIG_SERIAL_MCF) += mcf.o
obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
obj-$(CONFIG_SERIAL_HS_LPC32XX) += lpc32xx_hs.o
obj-$(CONFIG_SERIAL_DZ) += dz.o
obj-$(CONFIG_SERIAL_ZS) += zs.o
obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
Expand Down
Loading

0 comments on commit cf75ad9

Please sign in to comment.