Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e00f2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Serial/TTY fixes for the 3.3-rc3 tree

Just a few new device ids, omap serial driver regression fixes, and a
build fix for the 8250 driver movement.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* tag 'tty-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: serial: omap-serial: wakeup latency constraint is in microseconds, not milliseconds
  tty: serial: OMAP: block idle while the UART is transferring data in PIO mode
  tty: serial: OMAP: use a 1-byte RX FIFO threshold in PIO mode
  m32r: relocate drivers back out of 8250 dir
  tty: fix a build failure on sparc
  serial: samsung: Add support for EXYNOS5250
  serial: samsung: Add support for EXYNOS4212 and EXYNOS4412
  drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
parents b05ee6bf 19723452

arch/arm/mach-omap2/serial.c

+4 −4
Original line number Diff line number Diff line
@@ -107,18 +107,18 @@ static void omap_uart_set_noidle(struct platform_device *pdev) 
	omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_NO);

}



static void omap_uart_set_forceidle(struct platform_device *pdev)

static void omap_uart_set_smartidle(struct platform_device *pdev)

{

	struct omap_device *od = to_omap_device(pdev);



	omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_FORCE);

	omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_SMART);

}



#else

static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)

{}

static void omap_uart_set_noidle(struct platform_device *pdev) {}

static void omap_uart_set_forceidle(struct platform_device *pdev) {}

static void omap_uart_set_smartidle(struct platform_device *pdev) {}

#endif /* CONFIG_PM */



#ifdef CONFIG_OMAP_MUX
@@ -349,7 +349,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, 
	omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;

	omap_up.flags = UPF_BOOT_AUTOCONF;

	omap_up.get_context_loss_count = omap_pm_get_dev_context_loss_count;

	omap_up.set_forceidle = omap_uart_set_forceidle;

	omap_up.set_forceidle = omap_uart_set_smartidle;

	omap_up.set_noidle = omap_uart_set_noidle;

	omap_up.enable_wakeup = omap_uart_enable_wakeup;

	omap_up.dma_rx_buf_size = info->dma_rx_buf_size;

drivers/tty/serial/8250/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "8250.h"



#ifdef CONFIG_SPARC

#include "suncore.h"

#include "../suncore.h"

#endif



/*