Skip to content

Commit 537bd0a

Browse files
committed
Merge tag 'tty-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH: "Here is the "big" tty and serial driver patches for 5.5-rc1. It's a bit later in the merge window than normal as I wanted to make sure some last-minute patches applied to it were all sane. They seem to be :) There's a lot of little stuff in here, for the tty core, and for lots of serial drivers: - reverts of uartlite serial driver patches that were wrong - msm-serial driver fixes - serial core updates and fixes - tty core fixes - serial driver dma mapping api changes - lots of other tiny fixes and updates for serial drivers All of these have been in linux-next for a while with no reported issues" * tag 'tty-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (58 commits) Revert "serial/8250: Add support for NI-Serial PXI/PXIe+485 devices" vcs: prevent write access to vcsu devices tty: vt: keyboard: reject invalid keycodes tty: don't crash in tty_init_dev when missing tty_port serial: stm32: fix clearing interrupt error flags tty: Fix Kconfig indentation, continued serial: serial_core: Perform NULL checks for break_ctl ops tty: remove unused argument from tty_open_by_driver() tty: Fix Kconfig indentation {tty: serial, nand: onenand}: samsung: rename to fix build warning serial: ifx6x60: add missed pm_runtime_disable serial: pl011: Fix DMA ->flush_buffer() Revert "serial-uartlite: Move the uart register" Revert "serial-uartlite: Add get serial id if not provided" Revert "serial-uartlite: Do not use static struct uart_driver out of probe()" Revert "serial-uartlite: Add runtime support" Revert "serial-uartlite: Change logic how console_port is setup" Revert "serial-uartlite: Use allocated structure instead of static ones" tty: serial: msm_serial: Use dma_request_chan() directly for channel request tty: serial: tegra: Use dma_request_chan() directly for channel request ...
2 parents c3bed3b + 27ed14d commit 537bd0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+665
-715
lines changed

Documentation/ABI/stable/sysfs-driver-aspeed-vuart

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ Description: Configures which IO port the host side of the UART
66
Users: OpenBMC. Proposed changes should be mailed to
77
88

9-
What: /sys/bus/platform/drivers/aspeed-vuart*/sirq
9+
What: /sys/bus/platform/drivers/aspeed-vuart/*/sirq
1010
Date: April 2017
1111
Contact: Jeremy Kerr <[email protected]>
1212
Description: Configures which interrupt number the host side of
1313
the UART will appear on the host <-> BMC LPC bus.
1414
Users: OpenBMC. Proposed changes should be mailed to
1515
16+
17+
What: /sys/bus/platform/drivers/aspeed-vuart/*/sirq_polarity
18+
Date: July 2019
19+
Contact: Oskar Senft <[email protected]>
20+
Description: Configures the polarity of the serial interrupt to the
21+
host via the BMC LPC bus.
22+
Set to 0 for active-low or 1 for active-high.
23+
Users: OpenBMC. Proposed changes should be mailed to
24+

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@
10971097
mapped with the correct attributes.
10981098

10991099
linflex,<addr>
1100-
Use early console provided by Freescale LinFlex UART
1100+
Use early console provided by Freescale LINFlexD UART
11011101
serial driver for NXP S32V234 SoCs. A valid base
11021102
address must be provided, and the serial port must
11031103
already be setup and configured.

Documentation/devicetree/bindings/serial/8250.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ Optional properties:
5656
- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD
5757
line respectively. It will use specified GPIO instead of the peripheral
5858
function pin for the UART feature. If unsure, don't specify this property.
59+
- aspeed,sirq-polarity-sense: Only applicable to aspeed,ast2500-vuart.
60+
phandle to aspeed,ast2500-scu compatible syscon alongside register offset
61+
and bit number to identify how the SIRQ polarity should be configured.
62+
One possible data source is the LPC/eSPI mode bit.
63+
Example: aspeed,sirq-polarity-sense = <&syscon 0x70 25>
5964

6065
Note:
6166
* fsl,ns16550:

Documentation/devicetree/bindings/serial/fsl-lpuart.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ Required properties:
2121
Optional properties:
2222
- dmas: A list of two dma specifiers, one for each entry in dma-names.
2323
- dma-names: should contain "tx" and "rx".
24-
- rs485-rts-delay, rs485-rts-active-low, rs485-rx-during-tx,
25-
linux,rs485-enabled-at-boot-time: see rs485.txt
24+
- rs485-rts-active-low, linux,rs485-enabled-at-boot-time: see rs485.txt
2625

2726
Note: Optional properties for DMA support. Write them both or both not.
2827

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ Required properties:
5454
- "renesas,hscif-r8a7794" for R8A7794 (R-Car E2) HSCIF compatible UART.
5555
- "renesas,scif-r8a7795" for R8A7795 (R-Car H3) SCIF compatible UART.
5656
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
57-
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.
58-
- "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.
57+
- "renesas,scif-r8a7796" for R8A77960 (R-Car M3-W) SCIF compatible UART.
58+
- "renesas,hscif-r8a7796" for R8A77960 (R-Car M3-W) HSCIF compatible UART.
59+
- "renesas,scif-r8a77961" for R8A77961 (R-Car M3-W+) SCIF compatible UART.
60+
- "renesas,hscif-r8a77961" for R8A77961 (R-Car M3-W+) HSCIF compatible UART.
5961
- "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART.
6062
- "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART.
6163
- "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.

Documentation/process/magic-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip
8181
ISICOM_MAGIC 0x4d54 isi_port ``include/linux/isicom.h``
8282
PTY_MAGIC 0x5001 ``drivers/char/pty.c``
8383
PPP_MAGIC 0x5002 ppp ``include/linux/if_pppvar.h``
84-
SERIAL_MAGIC 0x5301 async_struct ``include/linux/serial.h``
8584
SSTATE_MAGIC 0x5302 serial_state ``include/linux/serial.h``
8685
SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h``
8786
STRIP_MAGIC 0x5303 strip ``drivers/net/strip.c``

Documentation/translations/it_IT/process/magic-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip
8787
ISICOM_MAGIC 0x4d54 isi_port ``include/linux/isicom.h``
8888
PTY_MAGIC 0x5001 ``drivers/char/pty.c``
8989
PPP_MAGIC 0x5002 ppp ``include/linux/if_pppvar.h``
90-
SERIAL_MAGIC 0x5301 async_struct ``include/linux/serial.h``
9190
SSTATE_MAGIC 0x5302 serial_state ``include/linux/serial.h``
9291
SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h``
9392
STRIP_MAGIC 0x5303 strip ``drivers/net/strip.c``

Documentation/translations/zh_CN/process/magic-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip
7070
ISICOM_MAGIC 0x4d54 isi_port ``include/linux/isicom.h``
7171
PTY_MAGIC 0x5001 ``drivers/char/pty.c``
7272
PPP_MAGIC 0x5002 ppp ``include/linux/if_pppvar.h``
73-
SERIAL_MAGIC 0x5301 async_struct ``include/linux/serial.h``
7473
SSTATE_MAGIC 0x5302 serial_state ``include/linux/serial.h``
7574
SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h``
7675
STRIP_MAGIC 0x5303 strip ``drivers/net/strip.c``

arch/arm/boot/dts/aspeed-g5.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@
379379
interrupts = <8>;
380380
clocks = <&syscon ASPEED_CLK_APB>;
381381
no-loopback-test;
382+
aspeed,sirq-polarity-sense = <&syscon 0x70 25>;
382383
status = "disabled";
383384
};
384385

drivers/mtd/nand/onenand/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ obj-$(CONFIG_MTD_ONENAND) += onenand.o
99
# Board specific.
1010
obj-$(CONFIG_MTD_ONENAND_GENERIC) += generic.o
1111
obj-$(CONFIG_MTD_ONENAND_OMAP2) += omap2.o
12-
obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung.o
12+
obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung_mtd.o
1313

1414
onenand-objs = onenand_base.o onenand_bbt.o

0 commit comments

Comments
 (0)