mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 15:11:50 +00:00
[PATCH] fix PNX8550 serial breakage
Fix the serial header breakage for the PNX8550 MIPS platform. Signed-off-by: Vitaly Wool <vitalywool@gmail.com> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vitaly Wool
Linus Torvalds
parent
8f31bb39ec
commit
e6fa0ba304
@ -122,7 +122,7 @@
|
||||
/*Digi jsm */
|
||||
#define PORT_JSM 69
|
||||
|
||||
#define PORT_IP3106 70
|
||||
#define PORT_PNX8XXX 70
|
||||
|
||||
/* Hilscher netx */
|
||||
#define PORT_NETX 71
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
/*
|
||||
* Embedded Alley Solutions, source@embeddedalley.com.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_SERIAL_IP3106_H
|
||||
#define _LINUX_SERIAL_IP3106_H
|
||||
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/device.h>
|
||||
|
||||
#define IP3106_NR_PORTS 2
|
||||
|
||||
struct ip3106_port {
|
||||
struct uart_port port;
|
||||
struct timer_list timer;
|
||||
unsigned int old_status;
|
||||
};
|
||||
|
||||
/* register offsets */
|
||||
#define IP3106_LCR 0
|
||||
#define IP3106_MCR 0x004
|
||||
#define IP3106_BAUD 0x008
|
||||
#define IP3106_CFG 0x00c
|
||||
#define IP3106_FIFO 0x028
|
||||
#define IP3106_ISTAT 0xfe0
|
||||
#define IP3106_IEN 0xfe4
|
||||
#define IP3106_ICLR 0xfe8
|
||||
#define IP3106_ISET 0xfec
|
||||
#define IP3106_PD 0xff4
|
||||
#define IP3106_MID 0xffc
|
||||
|
||||
#define IP3106_UART_LCR_TXBREAK (1<<30)
|
||||
#define IP3106_UART_LCR_PAREVN 0x10000000
|
||||
#define IP3106_UART_LCR_PAREN 0x08000000
|
||||
#define IP3106_UART_LCR_2STOPB 0x04000000
|
||||
#define IP3106_UART_LCR_8BIT 0x01000000
|
||||
#define IP3106_UART_LCR_TX_RST 0x00040000
|
||||
#define IP3106_UART_LCR_RX_RST 0x00020000
|
||||
#define IP3106_UART_LCR_RX_NEXT 0x00010000
|
||||
|
||||
#define IP3106_UART_MCR_SCR 0xFF000000
|
||||
#define IP3106_UART_MCR_DCD 0x00800000
|
||||
#define IP3106_UART_MCR_CTS 0x00100000
|
||||
#define IP3106_UART_MCR_LOOP 0x00000010
|
||||
#define IP3106_UART_MCR_RTS 0x00000002
|
||||
#define IP3106_UART_MCR_DTR 0x00000001
|
||||
|
||||
#define IP3106_UART_INT_TX 0x00000080
|
||||
#define IP3106_UART_INT_EMPTY 0x00000040
|
||||
#define IP3106_UART_INT_RCVTO 0x00000020
|
||||
#define IP3106_UART_INT_RX 0x00000010
|
||||
#define IP3106_UART_INT_RXOVRN 0x00000008
|
||||
#define IP3106_UART_INT_FRERR 0x00000004
|
||||
#define IP3106_UART_INT_BREAK 0x00000002
|
||||
#define IP3106_UART_INT_PARITY 0x00000001
|
||||
#define IP3106_UART_INT_ALLRX 0x0000003F
|
||||
#define IP3106_UART_INT_ALLTX 0x000000C0
|
||||
|
||||
#define IP3106_UART_FIFO_TXFIFO 0x001F0000
|
||||
#define IP3106_UART_FIFO_TXFIFO_STA (0x1f<<16)
|
||||
#define IP3106_UART_FIFO_RXBRK 0x00008000
|
||||
#define IP3106_UART_FIFO_RXFE 0x00004000
|
||||
#define IP3106_UART_FIFO_RXPAR 0x00002000
|
||||
#define IP3106_UART_FIFO_RXFIFO 0x00001F00
|
||||
#define IP3106_UART_FIFO_RBRTHR 0x000000FF
|
||||
|
||||
#endif
|
||||
81
include/linux/serial_pnx8xxx.h
Normal file
81
include/linux/serial_pnx8xxx.h
Normal file
@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Embedded Alley Solutions, source@embeddedalley.com.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_SERIAL_PNX8XXX_H
|
||||
#define _LINUX_SERIAL_PNX8XXX_H
|
||||
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/device.h>
|
||||
|
||||
#define PNX8XXX_NR_PORTS 2
|
||||
|
||||
struct pnx8xxx_port {
|
||||
struct uart_port port;
|
||||
struct timer_list timer;
|
||||
unsigned int old_status;
|
||||
};
|
||||
|
||||
/* register offsets */
|
||||
#define PNX8XXX_LCR 0
|
||||
#define PNX8XXX_MCR 0x004
|
||||
#define PNX8XXX_BAUD 0x008
|
||||
#define PNX8XXX_CFG 0x00c
|
||||
#define PNX8XXX_FIFO 0x028
|
||||
#define PNX8XXX_ISTAT 0xfe0
|
||||
#define PNX8XXX_IEN 0xfe4
|
||||
#define PNX8XXX_ICLR 0xfe8
|
||||
#define PNX8XXX_ISET 0xfec
|
||||
#define PNX8XXX_PD 0xff4
|
||||
#define PNX8XXX_MID 0xffc
|
||||
|
||||
#define PNX8XXX_UART_LCR_TXBREAK (1<<30)
|
||||
#define PNX8XXX_UART_LCR_PAREVN 0x10000000
|
||||
#define PNX8XXX_UART_LCR_PAREN 0x08000000
|
||||
#define PNX8XXX_UART_LCR_2STOPB 0x04000000
|
||||
#define PNX8XXX_UART_LCR_8BIT 0x01000000
|
||||
#define PNX8XXX_UART_LCR_TX_RST 0x00040000
|
||||
#define PNX8XXX_UART_LCR_RX_RST 0x00020000
|
||||
#define PNX8XXX_UART_LCR_RX_NEXT 0x00010000
|
||||
|
||||
#define PNX8XXX_UART_MCR_SCR 0xFF000000
|
||||
#define PNX8XXX_UART_MCR_DCD 0x00800000
|
||||
#define PNX8XXX_UART_MCR_CTS 0x00100000
|
||||
#define PNX8XXX_UART_MCR_LOOP 0x00000010
|
||||
#define PNX8XXX_UART_MCR_RTS 0x00000002
|
||||
#define PNX8XXX_UART_MCR_DTR 0x00000001
|
||||
|
||||
#define PNX8XXX_UART_INT_TX 0x00000080
|
||||
#define PNX8XXX_UART_INT_EMPTY 0x00000040
|
||||
#define PNX8XXX_UART_INT_RCVTO 0x00000020
|
||||
#define PNX8XXX_UART_INT_RX 0x00000010
|
||||
#define PNX8XXX_UART_INT_RXOVRN 0x00000008
|
||||
#define PNX8XXX_UART_INT_FRERR 0x00000004
|
||||
#define PNX8XXX_UART_INT_BREAK 0x00000002
|
||||
#define PNX8XXX_UART_INT_PARITY 0x00000001
|
||||
#define PNX8XXX_UART_INT_ALLRX 0x0000003F
|
||||
#define PNX8XXX_UART_INT_ALLTX 0x000000C0
|
||||
|
||||
#define PNX8XXX_UART_FIFO_TXFIFO 0x001F0000
|
||||
#define PNX8XXX_UART_FIFO_TXFIFO_STA (0x1f<<16)
|
||||
#define PNX8XXX_UART_FIFO_RXBRK 0x00008000
|
||||
#define PNX8XXX_UART_FIFO_RXFE 0x00004000
|
||||
#define PNX8XXX_UART_FIFO_RXPAR 0x00002000
|
||||
#define PNX8XXX_UART_FIFO_RXFIFO 0x00001F00
|
||||
#define PNX8XXX_UART_FIFO_RBRTHR 0x000000FF
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user