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

Commit 418a936e authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

tty: serial: altera_uart: Add CONSOLE_POLL support 



This allows altera_uart to be used for KGDB debugging over serial line.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f5dc707

drivers/tty/serial/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,12 +75,12 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o 
obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o

obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o

obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o

obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o

obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o

obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o

obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o

obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o

obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o

obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o

obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o

obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o

obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o

obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o

obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o

obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o

obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o

obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o

obj-$(CONFIG_SERIAL_MRST_MAX3110)	+= mrst_max3110.o

obj-$(CONFIG_SERIAL_MRST_MAX3110)	+= mrst_max3110.o

obj-$(CONFIG_SERIAL_MFD_HSU)	+= mfd.o

obj-$(CONFIG_SERIAL_MFD_HSU)	+= mfd.o

drivers/tty/serial/altera_uart.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -377,6 +377,26 @@ static int altera_uart_verify_port(struct uart_port *port, 
	return 0;

	return 0;

}

}





#ifdef CONFIG_CONSOLE_POLL

static int altera_uart_poll_get_char(struct uart_port *port)

{

	while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &

		 ALTERA_UART_STATUS_RRDY_MSK))

		cpu_relax();



	return altera_uart_readl(port, ALTERA_UART_RXDATA_REG);

}



static void altera_uart_poll_put_char(struct uart_port *port, unsigned char c)

{

	while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &

		 ALTERA_UART_STATUS_TRDY_MSK))

		cpu_relax();



	altera_uart_writel(port, c, ALTERA_UART_TXDATA_REG);

}

#endif



/*

/*

 *	Define the basic serial functions we support.

 *	Define the basic serial functions we support.

 */

 */
@@ -397,6 +417,10 @@ static struct uart_ops altera_uart_ops = { 
	.release_port	= altera_uart_release_port,

	.release_port	= altera_uart_release_port,

	.config_port	= altera_uart_config_port,

	.config_port	= altera_uart_config_port,

	.verify_port	= altera_uart_verify_port,

	.verify_port	= altera_uart_verify_port,

#ifdef CONFIG_CONSOLE_POLL

	.poll_get_char	= altera_uart_poll_get_char,

	.poll_put_char	= altera_uart_poll_put_char,

#endif

};

};





static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS];

static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS];