From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2018 01:43:49 +0000 (-0700)
Subject: Merge tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9abf8acea297b4c65f5fa3206e2b8e468e730e84;p=linux.git

Merge tag 'tty-4.17-rc1' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial driver updates from Greg KH:
 "Here is the big set of tty and serial driver patches for 4.17-rc1

  Not all that big really, most are just small fixes and additions to
  existing drivers. There's a bunch of work on the imx serial driver
  recently for some reason, and a new embedded serial driver added as
  well.

  Full details are in the shortlog.

  All of these have been in the linux-next tree for a while with no
  reported issues"

* tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (66 commits)
  serial: expose buf_overrun count through proc interface
  serial: mvebu-uart: fix tx lost characters
  tty: serial: msm_geni_serial: Fix return value check in qcom_geni_serial_probe()
  tty: serial: msm_geni_serial: Add serial driver support for GENI based QUP
  8250-men-mcb: add support for 16z025 and 16z057
  powerpc: Mark the variable earlycon_acpi_spcr_enable maybe_unused
  serial: stm32: fix initialization of RS485 mode
  ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
  vt: change SGR 21 to follow the standards
  serdev: Fix typo in serdev_device_alloc
  ARM: dts: STi: Fix aliases property name for STi boards
  tty: st-asc: Update tty alias
  serial: stm32: add support for RS485 hardware control mode
  dt-bindings: serial: stm32: add RS485 optional properties
  selftests: add devpts selftests
  devpts: comment devpts_mntget()
  devpts: resolve devpts bind-mounts
  devpts: hoist out check for DEVPTS_SUPER_MAGIC
  serial: 8250: Add Nuvoton NPCM UART
  serial: mxs-auart: disable clks of Alphascale ASM9260
  ...
---

9abf8acea297b4c65f5fa3206e2b8e468e730e84
diff --cc drivers/tty/hvc/Kconfig
index 3bade5ad3d718,e7cc617d6e457..4293c172e1202
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@@ -88,6 -88,25 +88,16 @@@ config HVC_DC
  	 driver. This console is used through a JTAG only on ARM. If you don't have
  	 a JTAG then you probably don't want this option.
  
 -config HVC_BFIN_JTAG
 -	bool "Blackfin JTAG console"
 -	depends on BLACKFIN
 -	select HVC_DRIVER
 -	help
 -	 This console uses the Blackfin JTAG to create a console under the
 -	 the HVC driver.  If you don't have JTAG, then you probably don't
 -	 want this option.
 -
+ config HVC_RISCV_SBI
+ 	bool "RISC-V SBI console support"
+ 	depends on RISCV
+ 	select HVC_DRIVER
+ 	help
+ 	  This enables support for console output via RISC-V SBI calls, which
+ 	  is normally used only during boot to output printk.
+ 
+ 	  If you don't know what do to here, say Y.
+ 
  config HVCS
  	tristate "IBM Hypervisor Virtual Console Server support"
  	depends on PPC_PSERIES && HVC_CONSOLE
diff --cc drivers/tty/hvc/Makefile
index 7da1934d34e81,83079ae000aee..98880e357941e
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@@ -9,4 -10,6 +9,5 @@@ obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.
  obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o
  obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o
  obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o
 -obj-$(CONFIG_HVC_BFIN_JTAG)	+= hvc_bfin_jtag.o
+ obj-$(CONFIG_HVC_RISCV_SBI)	+= hvc_riscv_sbi.o
  obj-$(CONFIG_HVCS)		+= hvcs.o