Skip to content

Commit b6fce73

Browse files
jan-kiszkagregkh
authored andcommitted
serial: 8250_pci: Use symbolic constants for EXAR's MPIO registers
Less magic that only requires comments. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e06690b commit b6fce73

File tree

1 file changed

+34
-21
lines changed

1 file changed

+34
-21
lines changed

drivers/tty/serial/8250/8250_pci.c

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,19 @@ static int pci_eg20t_init(struct pci_dev *dev)
15831583
#define PCI_DEVICE_ID_EXAR_XR17V4358 0x4358
15841584
#define PCI_DEVICE_ID_EXAR_XR17V8358 0x8358
15851585

1586+
#define UART_EXAR_MPIOINT_7_0 0x8f /* MPIOINT[7:0] */
1587+
#define UART_EXAR_MPIOLVL_7_0 0x90 /* MPIOLVL[7:0] */
1588+
#define UART_EXAR_MPIO3T_7_0 0x91 /* MPIO3T[7:0] */
1589+
#define UART_EXAR_MPIOINV_7_0 0x92 /* MPIOINV[7:0] */
1590+
#define UART_EXAR_MPIOSEL_7_0 0x93 /* MPIOSEL[7:0] */
1591+
#define UART_EXAR_MPIOOD_7_0 0x94 /* MPIOOD[7:0] */
1592+
#define UART_EXAR_MPIOINT_15_8 0x95 /* MPIOINT[15:8] */
1593+
#define UART_EXAR_MPIOLVL_15_8 0x96 /* MPIOLVL[15:8] */
1594+
#define UART_EXAR_MPIO3T_15_8 0x97 /* MPIO3T[15:8] */
1595+
#define UART_EXAR_MPIOINV_15_8 0x98 /* MPIOINV[15:8] */
1596+
#define UART_EXAR_MPIOSEL_15_8 0x99 /* MPIOSEL[15:8] */
1597+
#define UART_EXAR_MPIOOD_15_8 0x9a /* MPIOOD[15:8] */
1598+
15861599
static int
15871600
pci_xr17c154_setup(struct serial_private *priv,
15881601
const struct pciserial_board *board,
@@ -1625,18 +1638,18 @@ pci_xr17v35x_setup(struct serial_private *priv,
16251638
* Setup Multipurpose Input/Output pins.
16261639
*/
16271640
if (idx == 0) {
1628-
writeb(0x00, p + 0x8f); /*MPIOINT[7:0]*/
1629-
writeb(0x00, p + 0x90); /*MPIOLVL[7:0]*/
1630-
writeb(0x00, p + 0x91); /*MPIO3T[7:0]*/
1631-
writeb(0x00, p + 0x92); /*MPIOINV[7:0]*/
1632-
writeb(0x00, p + 0x93); /*MPIOSEL[7:0]*/
1633-
writeb(0x00, p + 0x94); /*MPIOOD[7:0]*/
1634-
writeb(0x00, p + 0x95); /*MPIOINT[15:8]*/
1635-
writeb(0x00, p + 0x96); /*MPIOLVL[15:8]*/
1636-
writeb(0x00, p + 0x97); /*MPIO3T[15:8]*/
1637-
writeb(0x00, p + 0x98); /*MPIOINV[15:8]*/
1638-
writeb(0x00, p + 0x99); /*MPIOSEL[15:8]*/
1639-
writeb(0x00, p + 0x9a); /*MPIOOD[15:8]*/
1641+
writeb(0x00, p + UART_EXAR_MPIOINT_7_0);
1642+
writeb(0x00, p + UART_EXAR_MPIOLVL_7_0);
1643+
writeb(0x00, p + UART_EXAR_MPIO3T_7_0);
1644+
writeb(0x00, p + UART_EXAR_MPIOINV_7_0);
1645+
writeb(0x00, p + UART_EXAR_MPIOSEL_7_0);
1646+
writeb(0x00, p + UART_EXAR_MPIOOD_7_0);
1647+
writeb(0x00, p + UART_EXAR_MPIOINT_15_8);
1648+
writeb(0x00, p + UART_EXAR_MPIOLVL_15_8);
1649+
writeb(0x00, p + UART_EXAR_MPIO3T_15_8);
1650+
writeb(0x00, p + UART_EXAR_MPIOINV_15_8);
1651+
writeb(0x00, p + UART_EXAR_MPIOSEL_15_8);
1652+
writeb(0x00, p + UART_EXAR_MPIOOD_15_8);
16401653
}
16411654
writeb(0x00, p + UART_EXAR_8XMODE);
16421655
writeb(UART_FCTR_EXAR_TRGD, p + UART_EXAR_FCTR);
@@ -1672,20 +1685,20 @@ pci_fastcom335_setup(struct serial_private *priv,
16721685
switch (priv->dev->device) {
16731686
case PCI_DEVICE_ID_COMMTECH_4222PCI335:
16741687
case PCI_DEVICE_ID_COMMTECH_4224PCI335:
1675-
writeb(0x78, p + 0x90); /* MPIOLVL[7:0] */
1676-
writeb(0x00, p + 0x92); /* MPIOINV[7:0] */
1677-
writeb(0x00, p + 0x93); /* MPIOSEL[7:0] */
1688+
writeb(0x78, p + UART_EXAR_MPIOLVL_7_0);
1689+
writeb(0x00, p + UART_EXAR_MPIOINV_7_0);
1690+
writeb(0x00, p + UART_EXAR_MPIOSEL_7_0);
16781691
break;
16791692
case PCI_DEVICE_ID_COMMTECH_2324PCI335:
16801693
case PCI_DEVICE_ID_COMMTECH_2328PCI335:
1681-
writeb(0x00, p + 0x90); /* MPIOLVL[7:0] */
1682-
writeb(0xc0, p + 0x92); /* MPIOINV[7:0] */
1683-
writeb(0xc0, p + 0x93); /* MPIOSEL[7:0] */
1694+
writeb(0x00, p + UART_EXAR_MPIOLVL_7_0);
1695+
writeb(0xc0, p + UART_EXAR_MPIOINV_7_0);
1696+
writeb(0xc0, p + UART_EXAR_MPIOSEL_7_0);
16841697
break;
16851698
}
1686-
writeb(0x00, p + 0x8f); /* MPIOINT[7:0] */
1687-
writeb(0x00, p + 0x91); /* MPIO3T[7:0] */
1688-
writeb(0x00, p + 0x94); /* MPIOOD[7:0] */
1699+
writeb(0x00, p + UART_EXAR_MPIOINT_7_0);
1700+
writeb(0x00, p + UART_EXAR_MPIO3T_7_0);
1701+
writeb(0x00, p + UART_EXAR_MPIOOD_7_0);
16891702
}
16901703
writeb(0x00, p + UART_EXAR_8XMODE);
16911704
writeb(UART_FCTR_EXAR_TRGD, p + UART_EXAR_FCTR);

0 commit comments

Comments
 (0)