Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging

[karo-tx-uboot.git] / include / ns9750_ser.h

diff --git a/include/ns9750_ser.h b/include/ns9750_ser.h
index e6ff3e1727a9ce708890a1a9a350da819585cbf6..b5c297e436cb3670e5e6aa27fdf3b04eb9919789 100644 (file)
--- a/include/ns9750_ser.h
+++ b/include/ns9750_ser.h
@@ -75,7 +75,7 @@
 #define NS9750_SER_CTRL_A_ERXDMA       (0x00000100)
 #define NS9750_SER_CTRL_A_RIC_MA       (0x000000E0)
 #define NS9750_SER_CTRL_A_TIC_MA       (0x0000001E)
-#define NS9750_SER_CTRL_A_ETXDMA       (0x00000001)
+#define NS9750_SER_CTRL_A_ETXDMA       (0x00000001)
 
 /* control B register */
 
@@ -130,21 +130,21 @@
 #define NS9750_SER_STAT_A_TEMPTY       (0x00000001)
 
 #define NS9750_SER_STAT_A_RX_COND_ERR ( NS9750_SER_STAT_A_RFE | \
-                                       NS9750_SER_STAT_A_ROVER | \
+                                       NS9750_SER_STAT_A_ROVER | \
                                        NS9750_SER_STAT_A_RPE )
 #define NS9750_SER_STAT_A_RX_COND_ALL ( NS9750_SER_STAT_A_RX_COND_ERR | \
                                        NS9750_SER_STAT_A_RBRK | \
                                        NS9750_SER_STAT_A_RRDY | \
-                                       NS9750_SER_STAT_A_RHALF | \
-                                       NS9750_SER_STAT_A_RBC | \
-                                       NS9750_SER_STAT_A_DCDI | \
-                                       NS9750_SER_STAT_A_RII | \
-                                       NS9750_SER_STAT_A_DSRI | \
-                                       NS9750_SER_STAT_A_CTSI )
+                                       NS9750_SER_STAT_A_RHALF | \
+                                       NS9750_SER_STAT_A_RBC | \
+                                       NS9750_SER_STAT_A_DCDI | \
+                                       NS9750_SER_STAT_A_RII | \
+                                       NS9750_SER_STAT_A_DSRI | \
+                                       NS9750_SER_STAT_A_CTSI )
 #define NS9750_SER_STAT_A_TX_COND_ALL ( NS9750_SER_STAT_A_TRDY | \
                                        NS9750_SER_STAT_A_THALF | \
                                        NS9750_SER_STAT_A_TBC | \
-                                       NS9750_SER_STAT_A_TEMPTY )
+                                       NS9750_SER_STAT_A_TEMPTY )
 /* bit rate register */
 
 #define NS9750_SER_BITRATE_EBIT                 (0x80000000)
@@ -161,13 +161,13 @@
 #define NS9750_SER_BITRATE_TXCINV       (0x00800000)
 #define NS9750_SER_BITRATE_RXCINV       (0x00400000)
 #define NS9750_SER_BITRATE_TCDR_MA      (0x00180000)
-#define NS9750_SER_BITRATE_TCDR_1       (0x00000000)
-#define NS9750_SER_BITRATE_TCDR_8       (0x00080000)
+#define NS9750_SER_BITRATE_TCDR_1       (0x00000000)
+#define NS9750_SER_BITRATE_TCDR_8       (0x00080000)
 #define NS9750_SER_BITRATE_TCDR_16      (0x00100000)
 #define NS9750_SER_BITRATE_TCDR_32      (0x00180000)
 #define NS9750_SER_BITRATE_RCDR_MA      (0x00070000)
-#define NS9750_SER_BITRATE_RCDR_1       (0x00000000)
-#define NS9750_SER_BITRATE_RCDR_8       (0x00020000)
+#define NS9750_SER_BITRATE_RCDR_1       (0x00000000)
+#define NS9750_SER_BITRATE_RCDR_8       (0x00020000)
 #define NS9750_SER_BITRATE_RCDR_16      (0x00040000)
 #define NS9750_SER_BITRATE_RCDR_32      (0x00060000)
 #define NS9750_SER_BITRATE_TICS                 (0x00010000)