diff options
| author |   Jag Raman <jag.raman@oracle.com> | 2017-08-15 17:02:57 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-15 21:33:50 -0700 |
| commit | 55bd2133fc3c5ee138d19b76ed8f9495b35d57ec (patch) | |
| tree | 8ef969b232f1dd4554dbfbf12a1c1cfa1de213d9 | |
| parent | Merge branch 'sparc64-M7-memcpy' (diff) | |
| download | linux-dev-55bd2133fc3c5ee138d19b76ed8f9495b35d57ec.tar.xz linux-dev-55bd2133fc3c5ee138d19b76ed8f9495b35d57ec.zip | |
sparc64: vcc: Enable VCC module in linux
Enables the Virtual Console Concentrator (VCC) module
in linux kernel
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig | 1 | ||||
| -rw-r--r-- | drivers/tty/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 1 | ||||
| -rw-r--r-- | drivers/tty/vcc.c | 18 |
5 files changed, 26 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 84d6a8277cbd..28c0b4b98450 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12294,6 +12294,7 @@ F: drivers/tty/serial/sunsab.h F: drivers/tty/serial/sunsu.c F: drivers/tty/serial/sunzilog.c F: drivers/tty/serial/sunzilog.h +F: drivers/tty/vcc.c SPARSE CHECKER M: "Christopher Li" <sparse@chrisli.org> diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index ca8609d7292f..4d4e1cc6402f 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -238,3 +238,4 @@ CONFIG_CRYPTO_TWOFISH=m # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRC16=m CONFIG_LIBCRC32C=m +CONFIG_VCC=m diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index 95103054c0e4..8643b55dcae2 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -455,4 +455,9 @@ config MIPS_EJTAG_FDC_KGDB_CHAN help FDC channel number to use for KGDB. +config VCC + tristate "Sun Virtual Console Concentrator" + depends on SUN_LDOMS + help + Support for Sun logical domain consoles. endif # TTY diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 8689279afdf1..16330a819685 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o obj-$(CONFIG_GOLDFISH_TTY) += goldfish.o obj-$(CONFIG_DA_TTY) += metag_da.o obj-$(CONFIG_MIPS_EJTAG_FDC_TTY) += mips_ejtag_fdc.o +obj-$(CONFIG_VCC) += vcc.o obj-y += ipwireless/ diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c new file mode 100644 index 000000000000..e1b809927cd6 --- /dev/null +++ b/drivers/tty/vcc.c @@ -0,0 +1,18 @@ +/* vcc.c: sun4v virtual channel concentrator + * + * Copyright (C) 2017 Oracle. All rights reserved. + */ + +#include <linux/module.h> + +static int __init vcc_init(void) +{ + return 0; +} + +static void __exit vcc_exit(void) +{ +} + +module_init(vcc_init); +module_exit(vcc_exit); |