Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 575a2929 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7e55f81e 12de375e

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

+2 −2
Original line number Diff line number Diff line 
* Energymicro efm32 UART



Required properties:

- compatible : Should be "efm32,uart"

- compatible : Should be "energymicro,efm32-uart"

- reg : Address and length of the register set

- interrupts : Should contain uart interrupt
@@ -13,7 +13,7 @@ Optional properties: 
Example:



uart@0x4000c400 {

	compatible = "efm32,uart";

	compatible = "energymicro,efm32-uart";

	reg = <0x4000c400 0x400>;

	interrupts = <15>;

	efm32,location = <0>;

Documentation/kernel-parameters.txt

+0 −13
Original line number Diff line number Diff line
@@ -804,13 +804,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	dhash_entries=	[KNL]

			Set number of hash buckets for dentry cache.



	digi=		[HW,SERIAL]

			IO parameters + enable/disable command.



	digiepca=	[HW,SERIAL]

			See drivers/char/README.epca and

			Documentation/serial/digiepca.txt.



	disable=	[IPV6]

			See Documentation/networking/ipv6.txt.
@@ -2939,9 +2932,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	rhash_entries=	[KNL,NET]

			Set number of hash buckets for route cache



	riscom8=	[HW,SERIAL]

			Format: <io_board1>[,<io_board2>[,...<io_boardN>]]



	ro		[KNL] Mount root device read-only on boot



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

			See Documentation/laptops/sonypi.txt



	specialix=	[HW,SERIAL] Specialix multi-serial port adapter

			See Documentation/serial/specialix.txt.



	spia_io_base=	[HW,MTD]

	spia_fio_base=

	spia_pedr=

Documentation/magic-number.txt

+0 −12
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ Magic Name Number Structure File 
PG_MAGIC              'P'         pg_{read,write}_hdr include/linux/pg.h

CMAGIC                0x0111      user              include/linux/a.out.h

MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h

RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h

SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h

HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c

APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c

CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
@@ -82,7 +80,6 @@ STRIP_MAGIC 0x5303 strip drivers/net/strip.c 
X25_ASY_MAGIC         0x5303      x25_asy           drivers/net/x25_asy.h

SIXPACK_MAGIC         0x5304      sixpack           drivers/net/hamradio/6pack.h

AX25_MAGIC            0x5316      ax_disp           drivers/net/mkiss.h

ESP_MAGIC             0x53ee      esp_struct        drivers/char/esp.h

TTY_MAGIC             0x5401      tty_struct        include/linux/tty.h

MGSL_MAGIC            0x5401      mgsl_info         drivers/char/synclink.c

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 
RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c

USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h

CG_MAGIC              0x00090255  ufs_cylinder_group include/linux/ufs_fs.h

A2232_MAGIC           0x000a2232  gs_port           drivers/char/ser_a2232.h

RPORT_MAGIC           0x00525001  r_port            drivers/char/rocket_int.h

LSEMAGIC              0x05091998  lse               drivers/fc4/fc.c

GDTIOCTL_MAGIC        0x06030f07  gdth_iowr_str     drivers/scsi/gdth_ioctl.h

RIEBL_MAGIC           0x09051990                    drivers/net/atarilance.c

RIO_MAGIC             0x12345678  gs_port           drivers/char/rio/rio_linux.c

SX_MAGIC              0x12345678  gs_port           drivers/char/sx.h

NBD_REQUEST_MAGIC     0x12560953  nbd_request       include/linux/nbd.h

RED_MAGIC2            0x170fc2a5  (any)             mm/slab.c

BAYCOM_MAGIC          0x19730510  baycom_state      drivers/net/baycom_epp.c
@@ -116,7 +110,6 @@ ISDN_ASYNC_MAGIC 0x49344C01 modem_info include/linux/isdn.h 
CTC_ASYNC_MAGIC       0x49344C01  ctc_tty_info      drivers/s390/net/ctctty.c

ISDN_NET_MAGIC        0x49344C02  isdn_net_local_s  drivers/isdn/i4l/isdn_net_lib.h

SAVEKMSG_MAGIC2       0x4B4D5347  savekmsg          arch/*/amiga/config.c

STLI_BOARDMAGIC       0x4bc6c825  stlibrd           include/linux/istallion.h

CS_STATE_MAGIC        0x4c4f4749  cs_state          sound/oss/cs46xx.c

SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c

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 
SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c

GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h

RED_MAGIC1            0x5a2cf071  (any)             mm/slab.c

STL_PORTMAGIC         0x5a7182c9  stlport           include/linux/stallion.h

EEPROM_MAGIC_VALUE    0x5ab478d2  lanai_dev         drivers/atm/lanai.c

HDLCDRV_MAGIC         0x5ac6e778  hdlcdrv_state     include/linux/hdlcdrv.h

EPCA_MAGIC            0x5c6df104  channel           include/linux/epca.h

PCXX_MAGIC            0x5c6df104  channel           drivers/char/pcxx.h

KV_MAGIC              0x5f4b565f  kernel_vars_s     arch/mips/include/asm/sn/klkernvars.h

I810_STATE_MAGIC      0x63657373  i810_state        sound/oss/i810_audio.c
@@ -142,17 +133,14 @@ SLOT_MAGIC 0x67267322 slot drivers/hotplug/acpiphp.h 
LO_MAGIC              0x68797548  nbd_device        include/linux/nbd.h

OPROFILE_MAGIC        0x6f70726f  super_block       drivers/oprofile/oprofilefs.h

M3_STATE_MAGIC        0x734d724d  m3_state          sound/oss/maestro3.c

STL_PANELMAGIC        0x7ef621a1  stlpanel          include/linux/stallion.h

VMALLOC_MAGIC         0x87654320  snd_alloc_track   sound/core/memory.c

KMALLOC_MAGIC         0x87654321  snd_alloc_track   sound/core/memory.c

PWC_MAGIC             0x89DC10AB  pwc_device        drivers/usb/media/pwc.h

NBD_REPLY_MAGIC       0x96744668  nbd_reply         include/linux/nbd.h

STL_BOARDMAGIC        0xa2267f52  stlbrd            include/linux/stallion.h

ENI155_MAGIC          0xa54b872d  midway_eprom	    drivers/atm/eni.h

SCI_MAGIC             0xbabeface  gs_port           drivers/char/sh-sci.h

CODA_MAGIC            0xC0DAC0DA  coda_file_info    fs/coda/coda_fs_i.h

DPMEM_MAGIC           0xc0ffee11  gdt_pci_sram      drivers/scsi/gdth.h

STLI_PORTMAGIC        0xe671c7a1  stliport          include/linux/istallion.h

YAM_MAGIC             0xF10A7654  yam_port          drivers/net/hamradio/yam.c

CCB_MAGIC             0xf2691ad2  ccb               drivers/scsi/ncr53c8xx.c

QUEUE_MAGIC_FREE      0xf7e1c9a3  queue_entry       drivers/scsi/arm/queue.c

Documentation/serial/00-INDEX

+0 −8
Original line number Diff line number Diff line
@@ -2,23 +2,15 @@ 
	- this file.

README.cycladesZ

	- info on Cyclades-Z firmware loading.

digiepca.txt

	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.

driver

	- intro to the low level serial driver.

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

n_gsm.txt

	- GSM 0710 tty multiplexer howto.

riscom8.txt

	- notes on using the RISCom/8 multi-port serial driver.

rocket.txt

	- info on the Comtrol RocketPort multiport serial driver.

serial-rs485.txt

	- info about RS485 structures and support in the kernel.

specialix.txt

	- info on hardware/driver for specialix IO8+ multiport serial card.

sx.txt

	- info on the Specialix SX/SI multiport serial driver.

tty.txt

	- guide to the locking policies of the tty layer.

Documentation/serial/digiepca.txt

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
NOTE:  This driver is obsolete.  Digi provides a 2.6 driver (dgdm) at

http://www.digi.com for PCI cards.  They no longer maintain this driver,

and have no 2.6 driver for ISA cards.



This driver requires a number of user-space tools.  They can be acquired from

http://www.digi.com, but only works with 2.4 kernels.





The Digi Intl. epca driver. 

----------------------------

The Digi Intl. epca driver for Linux supports the following boards:



Digi PC/Xem, PC/Xr, PC/Xe, PC/Xi, PC/Xeve 

Digi EISA/Xem, PCI/Xem, PCI/Xr 



Limitations:

------------

Currently the driver only autoprobes for supported PCI boards. 



The Linux MAKEDEV command does not support generating the Digiboard

Devices.  Users executing digiConfig to setup EISA and PC series cards

will have their device nodes automatically constructed (cud?? for ~CLOCAL,

and ttyD?? for CLOCAL).  Users wishing to boot their board from the LILO

prompt, or those users booting PCI cards may use buildDIGI to construct 

the necessary nodes. 



Notes:

------

This driver may be configured via LILO.  For users who have already configured

their driver using digiConfig, configuring from LILO will override previous 

settings.  Multiple boards may be configured by issuing multiple LILO command 

lines.  For examples see the bottom of this document.



Device names start at 0 and continue up.  Beware of this as previous Digi 

drivers started device names with 1.



PCI boards are auto-detected and configured by the driver.  PCI boards will

be allocated device numbers (internally) beginning with the lowest PCI slot

first.  In other words a PCI card in slot 3 will always have higher device

nodes than a PCI card in slot 1. 



LILO config examples:

---------------------

Using LILO's APPEND command, a string of comma separated identifiers or 

integers can be used to configure supported boards.  The six values in order 

are:



   Enable/Disable this card or Override,

   Type of card: PC/Xe (AccelePort) (0), PC/Xeve (1), PC/Xem or PC/Xr (2), 

                 EISA/Xem (3), PC/64Xe (4), PC/Xi (5), 

   Enable/Disable alternate pin arrangement,

   Number of ports on this card,

   I/O Port where card is configured (in HEX if using string identifiers),

   Base of memory window (in HEX if using string identifiers), 



NOTE : PCI boards are auto-detected and configured.  Do not attempt to 

configure PCI boards with the LILO append command.  If you wish to override

previous configuration data (As set by digiConfig), but you do not wish to

configure any specific card (Example if there are PCI cards in the system) 

the following override command will accomplish this:

-> append="digi=2"



Samples:

   append="digiepca=E,PC/Xe,D,16,200,D0000"

                  or

   append="digi=1,0,0,16,512,851968"



Supporting Tools:

-----------------

Supporting tools include digiDload, digiConfig, buildPCI, and ditty.  See

drivers/char/README.epca for more details.  Note,

this driver REQUIRES that digiDload be executed prior to it being used. 

Failure to do this will result in an ENODEV error.



Documentation:

--------------

Complete documentation for this product may be found in the tool package. 



Sources of information and support:

-----------------------------------

Digi Intl. support site for this product:



->  http://www.digi.com



Acknowledgments:

----------------

Much of this work (And even text) was derived from a similar document 

supporting the original public domain DigiBoard driver Copyright (C)

1994,1995 Troy De Jongh.  Many thanks to Christoph Lameter 

(christoph@lameter.com) and Mike McLagan (mike.mclagan@linux.org) who authored 

and contributed to the original document. 



Changelog:

----------

10-29-04:	Update status of driver, remove dead links in document

		James Nelson <james4765@gmail.com>



2000 (?)	Original Document