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

Commit 1dcb884c authored by Christian Pellegrin's avatar Christian Pellegrin Committed by Linus Torvalds
Browse files

Add support for the MAX3100 SPI UART. 



(akpm: queued pending confirmation of the new major number)

[randy.dunlap@oracle.com: select SERIAL_CORE]
Signed-off-by: default avatarChristian Pellegrin <chripell@fsfe.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 05b36302

drivers/serial/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -533,6 +533,13 @@ config SERIAL_S3C6400 
	  Serial port support for the Samsung S3C6400 and S3C6410

	  Serial port support for the Samsung S3C6400 and S3C6410

	  SoCs

	  SoCs





config SERIAL_MAX3100

	tristate "MAX3100 support"

	depends on SPI

	select SERIAL_CORE

	help

	  MAX3100 chip support



config SERIAL_DZ

config SERIAL_DZ

	bool "DECstation DZ serial driver"

	bool "DECstation DZ serial driver"

	depends on MACH_DECSTATION && 32BIT

	depends on MACH_DECSTATION && 32BIT

drivers/serial/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o 
obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o

obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o

obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o

obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o

obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o

obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o

obj-$(CONFIG_SERIAL_MAX3100) += max3100.o

obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o

obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o

obj-$(CONFIG_SERIAL_MUX) += mux.o

obj-$(CONFIG_SERIAL_MUX) += mux.o

obj-$(CONFIG_SERIAL_68328) += 68328serial.o

obj-$(CONFIG_SERIAL_68328) += 68328serial.o

include/linux/serial_core.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,9 @@ 
/* NWPSERIAL */

/* NWPSERIAL */

#define PORT_NWPSERIAL	85

#define PORT_NWPSERIAL	85





/* MAX3100 */

#define PORT_MAX3100    86



#ifdef __KERNEL__

#ifdef __KERNEL__





#include <linux/compiler.h>

#include <linux/compiler.h>