Merge tag 'tty-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver fixes from Greg KH:
"Here are five small serial and tty and vt fixes for 6.16-rc4. Included
in here are:

- kerneldoc fixes for recent vt changes

- imx serial driver fix

- of_node sysfs fix for a regression

- vt missing notification fix

- 8250 dt bindings fix

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

* tag 'tty-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
dt-bindings: serial: 8250: Make clocks and clock-frequency exclusive
serial: imx: Restore original RXTL for console to fix data loss
serial: core: restore of_node information in sysfs
vt: fix kernel-doc warnings in ucs_get_fallback()
vt: add missing notification when switching back to text mode

Changed files
+16 -7
Documentation
devicetree
bindings
serial
drivers
+1 -1
Documentation/devicetree/bindings/serial/8250.yaml
··· 45 45 - ns16550 46 46 - ns16550a 47 47 then: 48 - anyOf: 48 + oneOf: 49 49 - required: [ clock-frequency ] 50 50 - required: [ clocks ] 51 51
+12 -5
drivers/tty/serial/imx.c
··· 235 235 enum imx_tx_state tx_state; 236 236 struct hrtimer trigger_start_tx; 237 237 struct hrtimer trigger_stop_tx; 238 + unsigned int rxtl; 238 239 }; 239 240 240 241 struct imx_port_ucrs { ··· 1340 1339 1341 1340 #define TXTL_DEFAULT 8 1342 1341 #define RXTL_DEFAULT 8 /* 8 characters or aging timer */ 1342 + #define RXTL_CONSOLE_DEFAULT 1 1343 1343 #define TXTL_DMA 8 /* DMA burst setting */ 1344 1344 #define RXTL_DMA 9 /* DMA burst setting */ 1345 1345 ··· 1459 1457 ucr1 &= ~(UCR1_RXDMAEN | UCR1_TXDMAEN | UCR1_ATDMAEN); 1460 1458 imx_uart_writel(sport, ucr1, UCR1); 1461 1459 1462 - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); 1460 + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, sport->rxtl); 1463 1461 1464 1462 sport->dma_is_enabled = 0; 1465 1463 } ··· 1484 1482 return retval; 1485 1483 } 1486 1484 1487 - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); 1485 + if (uart_console(&sport->port)) 1486 + sport->rxtl = RXTL_CONSOLE_DEFAULT; 1487 + else 1488 + sport->rxtl = RXTL_DEFAULT; 1489 + 1490 + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, sport->rxtl); 1488 1491 1489 1492 /* disable the DREN bit (Data Ready interrupt enable) before 1490 1493 * requesting IRQs ··· 1955 1948 if (retval) 1956 1949 clk_disable_unprepare(sport->clk_ipg); 1957 1950 1958 - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); 1951 + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, sport->rxtl); 1959 1952 1960 1953 uart_port_lock_irqsave(&sport->port, &flags); 1961 1954 ··· 2047 2040 /* If the receiver trigger is 0, set it to a default value */ 2048 2041 ufcr = imx_uart_readl(sport, UFCR); 2049 2042 if ((ufcr & UFCR_RXTL_MASK) == 0) 2050 - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); 2043 + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, sport->rxtl); 2051 2044 imx_uart_start_rx(port); 2052 2045 } 2053 2046 ··· 2309 2302 else 2310 2303 imx_uart_console_get_options(sport, &baud, &parity, &bits); 2311 2304 2312 - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); 2305 + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, sport->rxtl); 2313 2306 2314 2307 retval = uart_set_options(&sport->port, co, baud, parity, bits, flow); 2315 2308
+1
drivers/tty/serial/serial_base_bus.c
··· 72 72 dev->parent = parent_dev; 73 73 dev->bus = &serial_base_bus_type; 74 74 dev->release = release; 75 + device_set_of_node_from_dev(dev, parent_dev); 75 76 76 77 if (!serial_base_initialized) { 77 78 dev_dbg(port->dev, "uart_add_one_port() called before arch_initcall()?\n");
+1 -1
drivers/tty/vt/ucs.c
··· 206 206 207 207 /** 208 208 * ucs_get_fallback() - Get a substitution for the provided Unicode character 209 - * @base: Base Unicode code point (UCS-4) 209 + * @cp: Unicode code point (UCS-4) 210 210 * 211 211 * Get a simpler fallback character for the provided Unicode character. 212 212 * This is used for terminal display when corresponding glyph is unavailable.
+1
drivers/tty/vt/vt.c
··· 4650 4650 set_palette(vc); 4651 4651 set_cursor(vc); 4652 4652 vt_event_post(VT_EVENT_UNBLANK, vc->vc_num, vc->vc_num); 4653 + notify_update(vc); 4653 4654 } 4654 4655 EXPORT_SYMBOL(do_unblank_screen); 4655 4656