Commit 394f33f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty / serial fixes from Greg KH:
 "Here are some small tty and serial driver fixes for 6.11-rc4 to
  resolve some reported problems. Included in here are:

   - conmakehash.c userspace build issues

   - fsl_lpuart driver fix

   - 8250_omap revert for reported regression

   - atmel_serial rts flag fix

  All of these have been in linux-next this week with no reported
  issues"

* tag 'tty-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "serial: 8250_omap: Set the console genpd always on if no console suspend"
  tty: atmel_serial: use the correct RTS flag.
  tty: vt: conmakehash: remove non-portable code printing comment header
  tty: serial: fsl_lpuart: mark last busy before uart_add_one_port
parents 3d9061d2 0863bffd

drivers/tty/serial/8250/8250_omap.c

+5 −28
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/pm_wakeirq.h>

#include <linux/dma-mapping.h>

#include <linux/sys_soc.h>

#include <linux/pm_domain.h>



#include "8250.h"
@@ -119,12 +118,6 @@ 
#define UART_OMAP_TO_L                 0x26

#define UART_OMAP_TO_H                 0x27



/*

 * Copy of the genpd flags for the console.

 * Only used if console suspend is disabled

 */

static unsigned int genpd_flags_console;



struct omap8250_priv {

	void __iomem *membase;

	int line;
@@ -1655,7 +1648,6 @@ static int omap8250_suspend(struct device *dev) 
{

	struct omap8250_priv *priv = dev_get_drvdata(dev);

	struct uart_8250_port *up = serial8250_get_port(priv->line);

	struct generic_pm_domain *genpd = pd_to_genpd(dev->pm_domain);

	int err = 0;



	serial8250_suspend_port(priv->line);
@@ -1666,19 +1658,8 @@ static int omap8250_suspend(struct device *dev) 
	if (!device_may_wakeup(dev))

		priv->wer = 0;

	serial_out(up, UART_OMAP_WER, priv->wer);

	if (uart_console(&up->port)) {

		if (console_suspend_enabled)

	if (uart_console(&up->port) && console_suspend_enabled)

		err = pm_runtime_force_suspend(dev);

		else {

			/*

			 * The pd shall not be powered-off (no console suspend).

			 * Make copy of genpd flags before to set it always on.

			 * The original value is restored during the resume.

			 */

			genpd_flags_console = genpd->flags;

			genpd->flags |= GENPD_FLAG_ALWAYS_ON;

		}

	}

	flush_work(&priv->qos_work);



	return err;
@@ -1688,16 +1669,12 @@ static int omap8250_resume(struct device *dev) 
{

	struct omap8250_priv *priv = dev_get_drvdata(dev);

	struct uart_8250_port *up = serial8250_get_port(priv->line);

	struct generic_pm_domain *genpd = pd_to_genpd(dev->pm_domain);

	int err;



	if (uart_console(&up->port) && console_suspend_enabled) {

		if (console_suspend_enabled) {

		err = pm_runtime_force_resume(dev);

		if (err)

			return err;

		} else

			genpd->flags = genpd_flags_console;

	}



	serial8250_resume_port(priv->line);

drivers/tty/serial/atmel_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -2514,7 +2514,7 @@ static const struct uart_ops atmel_pops = { 
};



static const struct serial_rs485 atmel_rs485_supported = {

	.flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX,

	.flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RX_DURING_TX,

	.delay_rts_before_send = 1,

	.delay_rts_after_send = 1,

};

drivers/tty/serial/fsl_lpuart.c

+1 −0
Original line number Diff line number Diff line
@@ -2923,6 +2923,7 @@ static int lpuart_probe(struct platform_device *pdev) 
	pm_runtime_set_autosuspend_delay(&pdev->dev, UART_AUTOSUSPEND_TIMEOUT);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_mark_last_busy(&pdev->dev);



	ret = lpuart_global_reset(sport);

	if (ret)

drivers/tty/vt/conmakehash.c

+2 −10
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
 * Copyright (C) 1995-1997 H. Peter Anvin

 */



#include <libgen.h>

#include <linux/limits.h>

#include <stdio.h>

#include <stdlib.h>

#include <sysexits.h>
@@ -79,7 +77,6 @@ int main(int argc, char *argv[]) 
{

  FILE *ctbl;

  const char *tblname;

  char base_tblname[PATH_MAX];

  char buffer[65536];

  int fontlen;

  int i, nuni, nent;
@@ -245,20 +242,15 @@ int main(int argc, char *argv[]) 
  for ( i = 0 ; i < fontlen ; i++ )

    nuni += unicount[i];



  strncpy(base_tblname, tblname, PATH_MAX);

  base_tblname[PATH_MAX - 1] = 0;

  printf("\

/*\n\

 * Do not edit this file; it was automatically generated by\n\

 *\n\

 * conmakehash %s > [this file]\n\

 *\n\

 * Automatically generated file; Do not edit.\n\

 */\n\

\n\

#include <linux/types.h>\n\

\n\

u8 dfont_unicount[%d] = \n\

{\n\t", basename(base_tblname), fontlen);

{\n\t", fontlen);



  for ( i = 0 ; i < fontlen ; i++ )

    {