diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 15:23:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 15:23:20 -0400 |
| commit | 99dff5856220a02b8711f2e8746413ea6e53ccf6 (patch) | |
| tree | d8bae7ccdf8f7ad5221b053bb74a6220df996b3a | |
| parent | bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c (diff) | |
| parent | d9a0fbfd7bc5d2c42f0fa9bcbdab62c4942d0388 (diff) | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
tty/serial: Fix break handling for PORT_TEGRA
tty/serial: Add explicit PORT_TEGRA type
n_tracerouter and n_tracesink ldisc additions.
Intel PTI implementaiton of MIPI 1149.7.
Kernel documentation for the PTI feature.
export kernel call get_task_comm().
tty: Remove to support serial for S5P6442
pch_phub: Support new device ML7223
8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
ASoC: Update cx20442 for TTY API change
pch_uart: Support new device ML7223 IOH
parport: Use request_muxed_region for IT87 probe and lock
tty/serial: add support for Xilinx PS UART
n_gsm: Use print_hex_dump_bytes
drivers/tty/moxa.c: Put correct tty value
TTY: tty_io, annotate locking functions
TTY: serial_core, remove superfluous set_task_state
TTY: serial_core, remove invalid test
Char: moxa, fix locking in moxa_write
...
Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.
I did the hci_ldisc thing as an evil merge, cleaning things up.
103 files changed, 3348 insertions, 517 deletions
diff --git a/Documentation/pti/pti_intel_mid.txt b/Documentation/pti/pti_intel_mid.txt new file mode 100644 index 000000000000..e7a5b6d1f7a9 --- /dev/null +++ b/Documentation/pti/pti_intel_mid.txt | |||
| @@ -0,0 +1,99 @@ | |||
| 1 | The Intel MID PTI project is HW implemented in Intel Atom | ||
| 2 | system-on-a-chip designs based on the Parallel Trace | ||
| 3 | Interface for MIPI P1149.7 cJTAG standard. The kernel solution | ||
| 4 | for this platform involves the following files: | ||
| 5 | |||
| 6 | ./include/linux/pti.h | ||
| 7 | ./drivers/.../n_tracesink.h | ||
| 8 | ./drivers/.../n_tracerouter.c | ||
| 9 | ./drivers/.../n_tracesink.c | ||
| 10 | ./drivers/.../pti.c | ||
| 11 | |||
| 12 | pti.c is the driver that enables various debugging features | ||
| 13 | popular on platforms from certain mobile manufacturers. | ||
| 14 | n_tracerouter.c and n_tracesink.c allow extra system information to | ||
| 15 | be collected and routed to the pti driver, such as trace | ||
| 16 | debugging data from a modem. Although n_tracerouter | ||
| 17 | and n_tracesink are a part of the complete PTI solution, | ||
| 18 | these two line disciplines can work separately from | ||
| 19 | pti.c and route any data stream from one /dev/tty node | ||
| 20 | to another /dev/tty node via kernel-space. This provides | ||
| 21 | a stable, reliable connection that will not break unless | ||
| 22 | the user-space application shuts down (plus avoids | ||
| 23 | kernel->user->kernel context switch overheads of routing | ||
| 24 | data). | ||