Merge remote-tracking branch 'asoc/topic/sti' into asoc-next

[deliverable/linux.git] / include / linux / rio_regs.h

diff --git a/include/linux/rio_regs.h b/include/linux/rio_regs.h
index 218168a2b5e9c4fb94055b844b7326996f245447..1063ae382bc2d2db604561435dd1fd3a65c2018b 100644 (file)
--- a/include/linux/rio_regs.h
+++ b/include/linux/rio_regs.h
@@ -238,6 +238,8 @@
 #define  RIO_PORT_N_ACK_INBOUND                0x3f000000
 #define  RIO_PORT_N_ACK_OUTSTAND       0x00003f00
 #define  RIO_PORT_N_ACK_OUTBOUND       0x0000003f
+#define RIO_PORT_N_CTL2_CSR(x)         (0x0054 + x*0x20)
+#define  RIO_PORT_N_CTL2_SEL_BAUD      0xf0000000
 #define RIO_PORT_N_ERR_STS_CSR(x)      (0x0058 + x*0x20)
 #define  RIO_PORT_N_ERR_STS_PW_OUT_ES  0x00010000 /* Output Error-stopped */
 #define  RIO_PORT_N_ERR_STS_PW_INP_ES  0x00000100 /* Input Error-stopped */
@@ -249,6 +251,7 @@
 #define  RIO_PORT_N_CTL_PWIDTH         0xc0000000
 #define  RIO_PORT_N_CTL_PWIDTH_1       0x00000000
 #define  RIO_PORT_N_CTL_PWIDTH_4       0x40000000
+#define  RIO_PORT_N_CTL_IPW            0x38000000 /* Initialized Port Width */
 #define  RIO_PORT_N_CTL_P_TYP_SER      0x00000001
 #define  RIO_PORT_N_CTL_LOCKOUT                0x00000002
 #define  RIO_PORT_N_CTL_EN_RX_SER      0x00200000