aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavan Savoy <pavan_savoy@ti.com>2010-09-30 16:13:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 14:48:07 -0400
commit40fb29a777d23b1161271ec88fd21739835e4f6a (patch)
treed35dce49cd0ed9e02bb53e59401c8b9597939ba1
parent7e24cce38a99f373450db67bf576fe73e8168d66 (diff)
tty.h: new ldisc for TI WiLink ST
Texas Instrument's WiLink7 connectivity devices pack wireless connectivity technologies like Bluetooth, FM Radio Receiver and Transmitter, GPS and WLAN into a single die. The BT, FM and GPS core on the chip are interfaced to application processors via a single UART. This line discipline driver allows such different technologies to be used simultaneous and independent of each other. Signed-off-by: Pavan Savoy <pavan_savoy@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ti-st/ti_wilink_st.h5
-rw-r--r--include/linux/tty.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/ti-st/ti_wilink_st.h b/drivers/staging/ti-st/ti_wilink_st.h
index 537efce96d58..afb0cc644c1f 100644
--- a/drivers/staging/ti-st/ti_wilink_st.h
+++ b/drivers/staging/ti-st/ti_wilink_st.h
@@ -25,11 +25,6 @@
25#ifndef TI_WILINK_ST_H 25#ifndef TI_WILINK_ST_H
26#define TI_WILINK_ST_H 26#define TI_WILINK_ST_H
27 27
28/* TODO:
29 * Move the following to tty.h upon acceptance
30 */
31#define N_TI_WL 22 /* Ldisc for TI's WL BT, FM, GPS combo chips */
32
33#ifdef __KERNEL__ 28#ifdef __KERNEL__
34/** 29/**
35 * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW 30 * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 67d64e6efe7a..244bb8de2b92 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -50,6 +50,7 @@
50#define N_V253 19 /* Codec control over voice modem */ 50#define N_V253 19 /* Codec control over voice modem */
51#define N_CAIF 20 /* CAIF protocol for talking to modems */ 51#define N_CAIF 20 /* CAIF protocol for talking to modems */
52#define N_GSM0710 21 /* GSM 0710 Mux */ 52#define N_GSM0710 21 /* GSM 0710 Mux */
53#define N_TI_WL 22 /* for TI's WL BT, FM, GPS combo chips */
53 54
54/* 55/*
55 * This character is the same as _POSIX_VDISABLE: it cannot be used as 56 * This character is the same as _POSIX_VDISABLE: it cannot be used as