projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into devel
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
serial
/
Kconfig
diff --git
a/drivers/serial/Kconfig
b/drivers/serial/Kconfig
index 037c1e0b7c4c5bd137c0720ccaa3210716c09435..03422ce878cf0ffd08deeadac3b71c6699ebb5ce 100644
(file)
--- a/
drivers/serial/Kconfig
+++ b/
drivers/serial/Kconfig
@@
-459,7
+459,7
@@
config SERIAL_SAMSUNG_UARTS
int
depends on ARM && PLAT_S3C
default 2 if ARCH_S3C2400
int
depends on ARM && PLAT_S3C
default 2 if ARCH_S3C2400
- default 4 if ARCH_S3C64XX || CPU_S3C2443
+ default 4 if ARCH_S
5PC1XX || ARCH_S
3C64XX || CPU_S3C2443
default 3
help
Select the number of available UART ports for the Samsung S3C
default 3
help
Select the number of available UART ports for the Samsung S3C
@@
-527,12
+527,19
@@
config SERIAL_S3C24A0
config SERIAL_S3C6400
tristate "Samsung S3C6400/S3C6410 Serial port support"
config SERIAL_S3C6400
tristate "Samsung S3C6400/S3C6410 Serial port support"
- depends on SERIAL_SAMSUNG && (CPU_S3C600 || CPU_S3C6410)
+ depends on SERIAL_SAMSUNG && (CPU_S3C6
4
00 || CPU_S3C6410)
default y
help
Serial port support for the Samsung S3C6400 and S3C6410
SoCs
default y
help
Serial port support for the Samsung S3C6400 and S3C6410
SoCs
+config SERIAL_S5PC100
+ tristate "Samsung S5PC100 Serial port support"
+ depends on SERIAL_SAMSUNG && CPU_S5PC100
+ default y
+ help
+ Serial port support for the Samsung S5PC100 SoCs
+
config SERIAL_MAX3100
tristate "MAX3100 support"
depends on SPI
config SERIAL_MAX3100
tristate "MAX3100 support"
depends on SPI