tty: amba-pl011: remove ST micro registers from standard table

Remove the ST micro registers from the standard table.  These registers
should never be accessed in non-ST micro variants.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 88ff97e0d6b06ffe0ef70a05327fcf3f13c2f180..e0f9e3e739d09a49fe1f2a1a451f42632f6b14b1 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -75,8 +75,6 @@
 
 static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {
        [REG_DR] = UART01x_DR,
-       [REG_ST_DMAWM] = ST_UART011_DMAWM,
-       [REG_ST_TIMEOUT] = ST_UART011_TIMEOUT,
        [REG_FR] = UART01x_FR,
        [REG_LCRH_RX] = UART011_LCRH,
        [REG_LCRH_TX] = UART011_LCRH,
@@ -89,15 +87,6 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {
        [REG_MIS] = UART011_MIS,
        [REG_ICR] = UART011_ICR,
        [REG_DMACR] = UART011_DMACR,
-       [REG_ST_XFCR] = ST_UART011_XFCR,
-       [REG_ST_XON1] = ST_UART011_XON1,
-       [REG_ST_XON2] = ST_UART011_XON2,
-       [REG_ST_XOFF1] = ST_UART011_XOFF1,
-       [REG_ST_XOFF2] = ST_UART011_XOFF2,
-       [REG_ST_ITCR] = ST_UART011_ITCR,
-       [REG_ST_ITIP] = ST_UART011_ITIP,
-       [REG_ST_ABCR] = ST_UART011_ABCR,
-       [REG_ST_ABIMSC] = ST_UART011_ABIMSC,
 };
 
 /* There is by now at least one vendor with differing details, so handle it */