Skip to content

Commit 575a292

Browse files
torvaldstorvalds
committed
Merge tag 'tty-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH: "Here are a number of small tty/serial driver fixes for 3.15-rc2. Also in here are some Documentation file removals for drivers that we removed a long time ago, no need to keep it around any longer. All of these have been in linux-next for a bit" * tag 'tty-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "serial: 8250, disable "too much work" messages" serial: amba-pl011: fix regression, causing an Oops on rmmod tty: Fix help text of SYNCLINK_CS tty: fix memleak in alloc_pid ttyprintk: Allow built as a module ttyprintk: Fix wrong tty_unregister_driver() call in the error path serial: 8250, disable "too much work" messages Documentation/serial: Delete obsolete driver documentation serial: omap: Fix missing pm_runtime_resume handling by simplifying code serial_core: Fix pm imbalance on unbind serial: pl011: change Rx burst size to half of trigger level serial: timberdale: Depend on X86_32 serial: st-asc: Fix SysRq char handling Revert "serial: clps711x: Give a chance to perform useful tasks during wait loop" serial_core: Fix conditional start_tx on ring buffer not empty serial: efm32: use $vendor,$device scheme for compatible string serial: omap: free the wakeup settings in remove
2 parents 7e55f81 + 12de375 commit 575a292

File tree

21 files changed

+57
-907
lines changed

21 files changed

+57
-907
lines changed

‎Documentation/devicetree/bindings/serial/efm32-uart.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* Energymicro efm32 UART
22

33
Required properties:
4-
- compatible : Should be "efm32,uart"
4+
- compatible : Should be "energymicro,efm32-uart"
55
- reg : Address and length of the register set
66
- interrupts : Should contain uart interrupt
77

@@ -13,7 +13,7 @@ Optional properties:
1313
Example:
1414

1515
uart@0x4000c400 {
16-
compatible = "efm32,uart";
16+
compatible = "energymicro,efm32-uart";
1717
reg = <0x4000c400 0x400>;
1818
interrupts = <15>;
1919
efm32,location = <0>;

‎Documentation/kernel-parameters.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -804,13 +804,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
804804
dhash_entries= [KNL]
805805
Set number of hash buckets for dentry cache.
806806

807-
digi= [HW,SERIAL]
808-
IO parameters + enable/disable command.
809-
810-
digiepca= [HW,SERIAL]
811-
See drivers/char/README.epca and
812-
Documentation/serial/digiepca.txt.
813-
814807
disable= [IPV6]
815808
See Documentation/networking/ipv6.txt.
816809

@@ -2939,9 +2932,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
29392932
rhash_entries= [KNL,NET]
29402933
Set number of hash buckets for route cache
29412934

2942-
riscom8= [HW,SERIAL]
2943-
Format: <io_board1>[,<io_board2>[,...<io_boardN>]]
2944-
29452935
ro [KNL] Mount root device read-only on boot
29462936

29472937
root= [KNL] Root filesystem
@@ -3083,9 +3073,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
30833073
sonypi.*= [HW] Sony Programmable I/O Control Device driver
30843074
See Documentation/laptops/sonypi.txt
30853075

3086-
specialix= [HW,SERIAL] Specialix multi-serial port adapter
3087-
See Documentation/serial/specialix.txt.
3088-
30893076
spia_io_base= [HW,MTD]
30903077
spia_fio_base=
30913078
spia_pedr=

‎Documentation/magic-number.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ Magic Name Number Structure File
6363
PG_MAGIC 'P' pg_{read,write}_hdr include/linux/pg.h
6464
CMAGIC 0x0111 user include/linux/a.out.h
6565
MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
66-
RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h
67-
SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h
6866
HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
6967
APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c
7068
CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h
@@ -82,7 +80,6 @@ STRIP_MAGIC 0x5303 strip drivers/net/strip.c
8280
X25_ASY_MAGIC 0x5303 x25_asy drivers/net/x25_asy.h
8381
SIXPACK_MAGIC 0x5304 sixpack drivers/net/hamradio/6pack.h
8482
AX25_MAGIC 0x5316 ax_disp drivers/net/mkiss.h
85-
ESP_MAGIC 0x53ee esp_struct drivers/char/esp.h
8683
TTY_MAGIC 0x5401 tty_struct include/linux/tty.h
8784
MGSL_MAGIC 0x5401 mgsl_info drivers/char/synclink.c
8885
TTY_DRIVER_MAGIC 0x5402 tty_driver include/linux/tty_driver.h
@@ -94,13 +91,10 @@ USB_BLUETOOTH_MAGIC 0x6d02 usb_bluetooth drivers/usb/class/bluetty.c
9491
RFCOMM_TTY_MAGIC 0x6d02 net/bluetooth/rfcomm/tty.c
9592
USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h
9693
CG_MAGIC 0x00090255 ufs_cylinder_group include/linux/ufs_fs.h
97-
A2232_MAGIC 0x000a2232 gs_port drivers/char/ser_a2232.h
9894
RPORT_MAGIC 0x00525001 r_port drivers/char/rocket_int.h
9995
LSEMAGIC 0x05091998 lse drivers/fc4/fc.c
10096
GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str drivers/scsi/gdth_ioctl.h
10197
RIEBL_MAGIC 0x09051990 drivers/net/atarilance.c
102-
RIO_MAGIC 0x12345678 gs_port drivers/char/rio/rio_linux.c
103-
SX_MAGIC 0x12345678 gs_port drivers/char/sx.h
10498
NBD_REQUEST_MAGIC 0x12560953 nbd_request include/linux/nbd.h
10599
RED_MAGIC2 0x170fc2a5 (any) mm/slab.c
106100
BAYCOM_MAGIC 0x19730510 baycom_state drivers/net/baycom_epp.c
@@ -116,7 +110,6 @@ ISDN_ASYNC_MAGIC 0x49344C01 modem_info include/linux/isdn.h
116110
CTC_ASYNC_MAGIC 0x49344C01 ctc_tty_info drivers/s390/net/ctctty.c
117111
ISDN_NET_MAGIC 0x49344C02 isdn_net_local_s drivers/isdn/i4l/isdn_net_lib.h
118112
SAVEKMSG_MAGIC2 0x4B4D5347 savekmsg arch/*/amiga/config.c
119-
STLI_BOARDMAGIC 0x4bc6c825 stlibrd include/linux/istallion.h
120113
CS_STATE_MAGIC 0x4c4f4749 cs_state sound/oss/cs46xx.c
121114
SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c
122115
COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c
@@ -127,10 +120,8 @@ SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h
127120
SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c
128121
GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h
129122
RED_MAGIC1 0x5a2cf071 (any) mm/slab.c
130-
STL_PORTMAGIC 0x5a7182c9 stlport include/linux/stallion.h
131123
EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev drivers/atm/lanai.c
132124
HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state include/linux/hdlcdrv.h
133-
EPCA_MAGIC 0x5c6df104 channel include/linux/epca.h
134125
PCXX_MAGIC 0x5c6df104 channel drivers/char/pcxx.h
135126
KV_MAGIC 0x5f4b565f kernel_vars_s arch/mips/include/asm/sn/klkernvars.h
136127
I810_STATE_MAGIC 0x63657373 i810_state sound/oss/i810_audio.c
@@ -142,17 +133,14 @@ SLOT_MAGIC 0x67267322 slot drivers/hotplug/acpiphp.h
142133
LO_MAGIC 0x68797548 nbd_device include/linux/nbd.h
143134
OPROFILE_MAGIC 0x6f70726f super_block drivers/oprofile/oprofilefs.h
144135
M3_STATE_MAGIC 0x734d724d m3_state sound/oss/maestro3.c
145-
STL_PANELMAGIC 0x7ef621a1 stlpanel include/linux/stallion.h
146136
VMALLOC_MAGIC 0x87654320 snd_alloc_track sound/core/memory.c
147137
KMALLOC_MAGIC 0x87654321 snd_alloc_track sound/core/memory.c
148138
PWC_MAGIC 0x89DC10AB pwc_device drivers/usb/media/pwc.h
149139
NBD_REPLY_MAGIC 0x96744668 nbd_reply include/linux/nbd.h
150-
STL_BOARDMAGIC 0xa2267f52 stlbrd include/linux/stallion.h
151140
ENI155_MAGIC 0xa54b872d midway_eprom drivers/atm/eni.h
152141
SCI_MAGIC 0xbabeface gs_port drivers/char/sh-sci.h
153142
CODA_MAGIC 0xC0DAC0DA coda_file_info fs/coda/coda_fs_i.h
154143
DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram drivers/scsi/gdth.h
155-
STLI_PORTMAGIC 0xe671c7a1 stliport include/linux/istallion.h
156144
YAM_MAGIC 0xF10A7654 yam_port drivers/net/hamradio/yam.c
157145
CCB_MAGIC 0xf2691ad2 ccb drivers/scsi/ncr53c8xx.c
158146
QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry drivers/scsi/arm/queue.c

‎Documentation/serial/00-INDEX

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,15 @@
22
- this file.
33
README.cycladesZ
44
- info on Cyclades-Z firmware loading.
5-
digiepca.txt
6-
- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
75
driver
86
- intro to the low level serial driver.
97
moxa-smartio
108
- file with info on installing/using Moxa multiport serial driver.
119
n_gsm.txt
1210
- GSM 0710 tty multiplexer howto.
13-
riscom8.txt
14-
- notes on using the RISCom/8 multi-port serial driver.
1511
rocket.txt
1612
- info on the Comtrol RocketPort multiport serial driver.
1713
serial-rs485.txt
1814
- info about RS485 structures and support in the kernel.
19-
specialix.txt
20-
- info on hardware/driver for specialix IO8+ multiport serial card.
21-
sx.txt
22-
- info on the Specialix SX/SI multiport serial driver.
2315
tty.txt
2416
- guide to the locking policies of the tty layer.

‎Documentation/serial/digiepca.txt

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎Documentation/serial/riscom8.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)