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

Commit 89bf6dc5 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin Serial Driver: macro away the IER differences between processors 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 56f87713

drivers/serial/bfin_5xx.c

+4 −54
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ static void bfin_serial_stop_tx(struct uart_port *port) 
{

	struct bfin_serial_port *uart = (struct bfin_serial_port *)port;

	struct circ_buf *xmit = &uart->port.info->xmit;

#if !defined(CONFIG_BF54x) && !defined(CONFIG_SERIAL_BFIN_DMA)

	unsigned short ier;

#endif



	while (!(UART_GET_LSR(uart) & TEMT))

		cpu_relax();
@@ -82,12 +79,8 @@ static void bfin_serial_stop_tx(struct uart_port *port) 
#ifdef CONFIG_BF54x

	/* Clear TFI bit */

	UART_PUT_LSR(uart, TFI);

	UART_CLEAR_IER(uart, ETBEI);

#else

	ier = UART_GET_IER(uart);

	ier &= ~ETBEI;

	UART_PUT_IER(uart, ier);

#endif

	UART_CLEAR_IER(uart, ETBEI);

#endif

}
@@ -102,14 +95,7 @@ static void bfin_serial_start_tx(struct uart_port *port) 
	if (uart->tx_done)

		bfin_serial_dma_tx_chars(uart);

#else

#ifdef CONFIG_BF54x

	UART_SET_IER(uart, ETBEI);

#else

	unsigned short ier;

	ier = UART_GET_IER(uart);

	ier |= ETBEI;

	UART_PUT_IER(uart, ier);

#endif

	bfin_serial_tx_chars(uart);

#endif

}
@@ -121,20 +107,9 @@ static void bfin_serial_stop_rx(struct uart_port *port) 
{

	struct bfin_serial_port *uart = (struct bfin_serial_port *)port;

#ifdef CONFIG_KGDB_UART

	if (uart->port.line != CONFIG_KGDB_UART_PORT) {

	if (uart->port.line != CONFIG_KGDB_UART_PORT)

#endif

#ifdef CONFIG_BF54x

	UART_CLEAR_IER(uart, ERBFI);

#else

	unsigned short ier;



	ier = UART_GET_IER(uart);

	ier &= ~ERBFI;

	UART_PUT_IER(uart, ier);

#endif

#ifdef	CONFIG_KGDB_UART

	}

#endif

}



/*
@@ -208,9 +183,6 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart) 
	struct tty_struct *tty = uart->port.info->tty;

	unsigned int status, ch, flg;

	static struct timeval anomaly_start = { .tv_sec = 0 };

#ifdef CONFIG_KGDB_UART

	struct pt_regs *regs = get_irq_regs();

#endif



	status = UART_GET_LSR(uart);

	UART_CLEAR_LSR(uart);
@@ -220,6 +192,7 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart) 


#ifdef CONFIG_KGDB_UART

	if (uart->port.line == CONFIG_KGDB_UART_PORT) {

		struct pt_regs *regs = get_irq_regs();

		if (uart->port.cons->index == CONFIG_KGDB_UART_PORT && ch == 0x1) { /* Ctrl + A */

			kgdb_breakkey_pressed(regs);

			return;
@@ -391,7 +364,6 @@ static void bfin_serial_do_work(struct work_struct *work) 
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)

{

	struct circ_buf *xmit = &uart->port.info->xmit;

	unsigned short ier;



	uart->tx_done = 0;
@@ -429,13 +401,7 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) 
	set_dma_x_modify(uart->tx_dma_channel, 1);

	enable_dma(uart->tx_dma_channel);



#ifdef CONFIG_BF54x

	UART_SET_IER(uart, ETBEI);

#else

	ier = UART_GET_IER(uart);

	ier |= ETBEI;

	UART_PUT_IER(uart, ier);

#endif

}



static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
@@ -513,19 +479,12 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id) 
{

	struct bfin_serial_port *uart = dev_id;

	struct circ_buf *xmit = &uart->port.info->xmit;

	unsigned short ier;



	spin_lock(&uart->port.lock);

	if (!(get_dma_curr_irqstat(uart->tx_dma_channel)&DMA_RUN)) {

		disable_dma(uart->tx_dma_channel);

		clear_dma_irqstat(uart->tx_dma_channel);

#ifdef CONFIG_BF54x

		UART_CLEAR_IER(uart, ETBEI);

#else

		ier = UART_GET_IER(uart);

		ier &= ~ETBEI;

		UART_PUT_IER(uart, ier);

#endif

		xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);

		uart->port.icount.tx += uart->tx_count;
@@ -701,7 +660,6 @@ static int bfin_serial_startup(struct uart_port *port) 
# endif

	}





	if (request_irq

	    (uart->port.irq+1, bfin_serial_tx_int, IRQF_DISABLED,

	     "BFIN_UART_TX", uart)) {
@@ -710,11 +668,7 @@ static int bfin_serial_startup(struct uart_port *port) 
		return -EBUSY;

	}

#endif

#ifdef CONFIG_BF54x

	UART_SET_IER(uart, ERBFI);

#else

	UART_PUT_IER(uart, UART_GET_IER(uart) | ERBFI);

#endif

	return 0;

}
@@ -1290,11 +1244,7 @@ static int __init bfin_serial_init(void) 
		request_irq(uart->port.irq, bfin_serial_rx_int,

			IRQF_DISABLED, "BFIN_UART_RX", uart);

		pr_info("Request irq for kgdb uart port\n");

#ifdef CONFIG_BF54x

		UART_SET_IER(uart, ERBFI);

#else

		UART_PUT_IER(uart, UART_GET_IER(uart) | ERBFI);

#endif

		SSYNC();

		t.c_cflag = CS8|B57600;

		t.c_iflag = 0;

include/asm-blackfin/mach-bf527/bfin_serial_5xx.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define UART_PUT_CHAR(uart, v)   bfin_write16(((uart)->port.membase + OFFSET_THR), v)

#define UART_PUT_DLL(uart, v)    bfin_write16(((uart)->port.membase + OFFSET_DLL), v)

#define UART_PUT_IER(uart, v)    bfin_write16(((uart)->port.membase + OFFSET_IER), v)

#define UART_SET_IER(uart, v)    UART_PUT_IER(uart, UART_GET_IER(uart) | (v))

#define UART_CLEAR_IER(uart, v)  UART_PUT_IER(uart, UART_GET_IER(uart) & ~(v))

#define UART_PUT_DLH(uart, v)    bfin_write16(((uart)->port.membase + OFFSET_DLH), v)

#define UART_PUT_LCR(uart, v)    bfin_write16(((uart)->port.membase + OFFSET_LCR), v)

#define UART_PUT_GCTL(uart, v)   bfin_write16(((uart)->port.membase + OFFSET_GCTL), v)

include/asm-blackfin/mach-bf533/bfin_serial_5xx.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define UART_PUT_CHAR(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_THR),v)

#define UART_PUT_DLL(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLL),v)

#define UART_PUT_IER(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_IER),v)

#define UART_SET_IER(uart,v)    UART_PUT_IER(uart, UART_GET_IER(uart) | (v))

#define UART_CLEAR_IER(uart,v)  UART_PUT_IER(uart, UART_GET_IER(uart) & ~(v))

#define UART_PUT_DLH(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLH),v)

#define UART_PUT_LCR(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_LCR),v)

#define UART_PUT_GCTL(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_GCTL),v)

include/asm-blackfin/mach-bf537/bfin_serial_5xx.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define UART_PUT_CHAR(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_THR),v)

#define UART_PUT_DLL(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLL),v)

#define UART_PUT_IER(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_IER),v)

#define UART_SET_IER(uart,v)    UART_PUT_IER(uart, UART_GET_IER(uart) | (v))

#define UART_CLEAR_IER(uart,v)  UART_PUT_IER(uart, UART_GET_IER(uart) & ~(v))

#define UART_PUT_DLH(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLH),v)

#define UART_PUT_LCR(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_LCR),v)

#define UART_PUT_GCTL(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_GCTL),v)

include/asm-blackfin/mach-bf561/bfin_serial_5xx.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define UART_PUT_CHAR(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_THR),v)

#define UART_PUT_DLL(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLL),v)

#define UART_PUT_IER(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_IER),v)

#define UART_SET_IER(uart,v)    UART_PUT_IER(uart, UART_GET_IER(uart) | (v))

#define UART_CLEAR_IER(uart,v)  UART_PUT_IER(uart, UART_GET_IER(uart) & ~(v))

#define UART_PUT_DLH(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_DLH),v)

#define UART_PUT_LCR(uart,v)    bfin_write16(((uart)->port.membase + OFFSET_LCR),v)

#define UART_PUT_GCTL(uart,v)   bfin_write16(((uart)->port.membase + OFFSET_GCTL),v)