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

Commit fb881f78 authored by Paul Bolle's avatar Paul Bolle Committed by Sascha Hauer
Browse files

[ARM] build fixes for netX serial driver 



Make the netX serial driver tristate (as the help text implied). Make the
serial driver build correctly if the netX serial console is disabled. Do not
allow the netX serial console if the netX serial driver is build as a module.

Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent e946217e

drivers/serial/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3 
	  say Y or M.  Otherwise, say N.



config SERIAL_NETX

	bool "NetX serial port support"

	tristate "NetX serial port support"

	depends on ARM && ARCH_NETX

	select SERIAL_CORE

	help
@@ -1288,7 +1288,7 @@ config SERIAL_NETX 


config SERIAL_NETX_CONSOLE

	bool "Console on NetX serial port"

	depends on SERIAL_NETX

	depends on SERIAL_NETX=y

	select SERIAL_CORE_CONSOLE

	help

	  If you have enabled the serial port on the Hilscher NetX SoC

drivers/serial/netx-serial.c

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#define SERIAL_NX_MAJOR	204

#define MINOR_START	170



#ifdef CONFIG_SERIAL_NETX_CONSOLE



enum uart_regs {

	UART_DR              = 0x00,

	UART_SR              = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = { 
	}

};



#ifdef CONFIG_SERIAL_NETX_CONSOLE



static void netx_console_putchar(struct uart_port *port, int ch)

{

	while (readl(port->membase + UART_FR) & FR_BUSY);