aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-27 15:31:35 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-15 10:03:03 -0400
commit65388dad1bbb51a4eb6cc91b9fa865b57646fb67 (patch)
tree1e9671522c2576a14d6a14df95874e1449fc422d
parentc92992fc609fe99d926855eb1945f38ef4ad8e6c (diff)
docs: serial: move it to the driver-api
The contents of this directory is mostly driver-api stuff. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Documentation/driver-api/index.rst1
-rw-r--r--Documentation/driver-api/serial/cyclades_z.rst (renamed from Documentation/serial/cyclades_z.rst)0
-rw-r--r--Documentation/driver-api/serial/driver.rst (renamed from Documentation/serial/driver.rst)2
-rw-r--r--Documentation/driver-api/serial/index.rst (renamed from Documentation/serial/index.rst)2
-rw-r--r--Documentation/driver-api/serial/moxa-smartio.rst (renamed from Documentation/serial/moxa-smartio.rst)0
-rw-r--r--Documentation/driver-api/serial/n_gsm.rst (renamed from Documentation/serial/n_gsm.rst)0
-rw-r--r--Documentation/driver-api/serial/rocket.rst (renamed from Documentation/serial/rocket.rst)0
-rw-r--r--Documentation/driver-api/serial/serial-iso7816.rst (renamed from Documentation/serial/serial-iso7816.rst)0
-rw-r--r--Documentation/driver-api/serial/serial-rs485.rst (renamed from Documentation/serial/serial-rs485.rst)0
-rw-r--r--Documentation/driver-api/serial/tty.rst (renamed from Documentation/serial/tty.rst)0
-rw-r--r--MAINTAINERS6
-rw-r--r--drivers/tty/Kconfig4
-rw-r--r--drivers/tty/serial/ucc_uart.c2
-rw-r--r--include/linux/serial_core.h2
14 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index 1dde9692075c..cf39b8f9d0f9 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -88,6 +88,7 @@ available subsections can be seen below.
88 pti_intel_mid 88 pti_intel_mid
89 pwm 89 pwm
90 rfkill 90 rfkill
91 serial/index
91 sgi-ioc4 92 sgi-ioc4
92 sm501 93 sm501
93 smsc_ece1099 94 smsc_ece1099
diff --git a/Documentation/serial/cyclades_z.rst b/Documentation/driver-api/serial/cyclades_z.rst
index 532ff67e2f1c..532ff67e2f1c 100644
--- a/Documentation/serial/cyclades_z.rst
+++ b/Documentation/driver-api/serial/cyclades_z.rst
diff --git a/Documentation/serial/driver.rst b/Documentation/driver-api/serial/driver.rst
index 4537119bf624..31bd4e16fb1f 100644
--- a/Documentation/serial/driver.rst
+++ b/Documentation/driver-api/serial/driver.rst
@@ -311,7 +311,7 @@ hardware.
311 This call must not sleep 311 This call must not sleep
312 312
313 set_ldisc(port,termios) 313 set_ldisc(port,termios)
314 Notifier for discipline change. See Documentation/serial/tty.rst. 314 Notifier for discipline change. See Documentation/driver-api/serial/tty.rst.
315 315
316 Locking: caller holds tty_port->mutex 316 Locking: caller holds tty_port->mutex
317 317
diff --git a/Documentation/serial/index.rst b/Documentation/driver-api/serial/index.rst
index d0ba22ea23bf..33ad10d05b26 100644
--- a/Documentation/serial/index.rst
+++ b/Documentation/driver-api/serial/index.rst
@@ -1,4 +1,4 @@
1:orphan: 1.. SPDX-License-Identifier: GPL-2.0
2 2
3========================== 3==========================
4Support for Serial devices 4Support for Serial devices
diff --git a/Documentation/serial/moxa-smartio.rst b/Documentation/driver-api/serial/moxa-smartio.rst
index 156100f17c3f..156100f17c3f 100644
--- a/Documentation/serial/moxa-smartio.rst
+++ b/Documentation/driver-api/serial/moxa-smartio.rst
diff --git a/Documentation/serial/n_gsm.rst b/Documentation/driver-api/serial/n_gsm.rst
index f3ad9fd26408..f3ad9fd26408 100644
--- a/Documentation/serial/n_gsm.rst
+++ b/Documentation/driver-api/serial/n_gsm.rst
diff --git a/Documentation/serial/rocket.rst b/Documentation/driver-api/serial/rocket.rst
index 23761eae4282..23761eae4282 100644
--- a/Documentation/serial/rocket.rst
+++ b/Documentation/driver-api/serial/rocket.rst
diff --git a/Documentation/serial/serial-iso7816.rst b/Documentation/driver-api/serial/serial-iso7816.rst
index d990143de0c6..d990143de0c6 100644
--- a/Documentation/serial/serial-iso7816.rst
+++ b/Documentation/driver-api/serial/serial-iso7816.rst
diff --git a/Documentation/serial/serial-rs485.rst b/Documentation/driver-api/serial/serial-rs485.rst
index 6bc824f948f9..6bc824f948f9 100644
--- a/Documentation/serial/serial-rs485.rst
+++ b/Documentation/driver-api/serial/serial-rs485.rst
diff --git a/Documentation/serial/tty.rst b/Documentation/driver-api/serial/tty.rst
index dd972caacf3e..dd972caacf3e 100644
--- a/Documentation/serial/tty.rst
+++ b/Documentation/driver-api/serial/tty.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index d1a0a817dd92..4f88bca37c55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10767,7 +10767,7 @@ F: include/uapi/linux/meye.h
10767MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD 10767MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
10768M: Jiri Slaby <jirislaby@gmail.com> 10768M: Jiri Slaby <jirislaby@gmail.com>
10769S: Maintained 10769S: Maintained
10770F: Documentation/serial/moxa-smartio.rst 10770F: Documentation/driver-api/serial/moxa-smartio.rst
10771F: drivers/tty/mxser.* 10771F: drivers/tty/mxser.*
10772 10772
10773MR800 AVERMEDIA USB FM RADIO DRIVER 10773MR800 AVERMEDIA USB FM RADIO DRIVER
@@ -13689,7 +13689,7 @@ ROCKETPORT DRIVER
13689P: Comtrol Corp. 13689P: Comtrol Corp.
13690W: http://www.comtrol.com 13690W: http://www.comtrol.com
13691S: Maintained 13691S: Maintained
13692F: Documentation/serial/rocket.rst 13692F: Documentation/driver-api/serial/rocket.rst
13693F: drivers/tty/rocket* 13693F: drivers/tty/rocket*
13694 13694
13695ROCKETPORT EXPRESS/INFINITY DRIVER 13695ROCKETPORT EXPRESS/INFINITY DRIVER
@@ -16228,7 +16228,7 @@ M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16228M: Jiri Slaby <jslaby@suse.com> 16228M: Jiri Slaby <jslaby@suse.com>
16229S: Supported 16229S: Supported
16230T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git 16230T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
16231F: Documentation/serial/ 16231F: Documentation/driver-api/serial/
16232F: drivers/tty/ 16232F: drivers/tty/
16233F: drivers/tty/serial/serial_core.c 16233F: drivers/tty/serial/serial_core.c
16234F: include/linux/serial_core.h 16234F: include/linux/serial_core.h
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index ee51b9514225..c7623f99ac0f 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -175,7 +175,7 @@ config ROCKETPORT
175 This driver supports Comtrol RocketPort and RocketModem PCI boards. 175 This driver supports Comtrol RocketPort and RocketModem PCI boards.
176 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or 176 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
177 modems. For information about the RocketPort/RocketModem boards 177 modems. For information about the RocketPort/RocketModem boards
178 and this driver read <file:Documentation/serial/rocket.rst>. 178 and this driver read <file:Documentation/driver-api/serial/rocket.rst>.
179 179
180 To compile this driver as a module, choose M here: the 180 To compile this driver as a module, choose M here: the
181 module will be called rocket. 181 module will be called rocket.
@@ -193,7 +193,7 @@ config CYCLADES
193 your Linux box, for instance in order to become a dial-in server. 193 your Linux box, for instance in order to become a dial-in server.
194 194
195 For information about the Cyclades-Z card, read 195 For information about the Cyclades-Z card, read
196 <file:Documentation/serial/cyclades_z.rst>. 196 <file:Documentation/driver-api/serial/cyclades_z.rst>.
197 197
198 To compile this driver as a module, choose M here: the 198 To compile this driver as a module, choose M here: the
199 module will be called cyclades. 199 module will be called cyclades.
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 6e3c66ab0e62..a0555ae2b1ef 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1081,7 +1081,7 @@ static int qe_uart_verify_port(struct uart_port *port,
1081} 1081}
1082/* UART operations 1082/* UART operations
1083 * 1083 *
1084 * Details on these functions can be found in Documentation/serial/driver.rst 1084 * Details on these functions can be found in Documentation/driver-api/serial/driver.rst
1085 */ 1085 */
1086static const struct uart_ops qe_uart_pops = { 1086static const struct uart_ops qe_uart_pops = {
1087 .tx_empty = qe_uart_tx_empty, 1087 .tx_empty = qe_uart_tx_empty,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 05b179015d6c..2b78cc734719 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -32,7 +32,7 @@ struct device;
32 32
33/* 33/*
34 * This structure describes all the operations that can be done on the 34 * This structure describes all the operations that can be done on the
35 * physical hardware. See Documentation/serial/driver.rst for details. 35 * physical hardware. See Documentation/driver-api/serial/driver.rst for details.
36 */ 36 */
37struct uart_ops { 37struct uart_ops {
38 unsigned int (*tx_empty)(struct uart_port *); 38 unsigned int (*tx_empty)(struct uart_port *);