Merge commit '87ddedd'

[oweals/u-boot.git] / include / nios-io.h

diff --git a/include/nios-io.h b/include/nios-io.h
index 11ff78d0764fd2bdc4d7b968d08cdd1381d8e30d..dc7e127fe54d184b5864e9a67c25e92cbf286012 100644 (file)
--- a/include/nios-io.h
+++ b/include/nios-io.h
@@ -117,7 +117,7 @@ typedef volatile struct nios_spi_t {
        unsigned        status;         /* Status reg */
        unsigned        control;        /* Control reg */
        unsigned        reserved;       /* (master only) */
-       unsigned        slaveselect;    /* SPI slave selct mask (master only) */
+       unsigned        slaveselect;    /* SPI slave select mask (master only) */
 }nios_spi_t;
 
 /* status register */
@@ -136,4 +136,48 @@ typedef volatile struct nios_spi_t {
 #define NIOS_SPI_IE            (1 << 8)        /* exception int ena */
 #define NIOS_SPI_SSO           (1 << 10)       /* override SS_n output */
 
+/*------------------------------------------------------------------------
+ * ASMI
+ *----------------------------------------------------------------------*/
+typedef volatile struct nios_asmi_t {
+       unsigned        rxdata;         /* Rx data reg */
+       unsigned        txdata;         /* Tx data reg */
+       unsigned        status;         /* Status reg */
+       unsigned        control;        /* Control reg */
+       unsigned        reserved;
+       unsigned        slavesel;       /* Slave select */
+       unsigned        endofpacket;    /* End-of-packet reg */
+}nios_asmi_t;
+
+/* status register */
+#define NIOS_ASMI_ROE          (1 << 3)        /* rx overrun */
+#define NIOS_ASMI_TOE          (1 << 4)        /* tx overrun */
+#define NIOS_ASMI_TMT          (1 << 5)        /* tx empty */
+#define NIOS_ASMI_TRDY         (1 << 6)        /* tx ready */
+#define NIOS_ASMI_RRDY         (1 << 7)        /* rx ready */
+#define NIOS_ASMI_E            (1 << 8)        /* exception */
+#define NIOS_ASMI_EOP          (1 << 9)        /* eop detected */
+
+/* control register */
+#define NIOS_ASMI_IROE         (1 << 3)        /* rx overrun int ena */
+#define NIOS_ASMI_ITOE         (1 << 4)        /* tx overrun int ena */
+#define NIOS_ASMI_ITRDY                (1 << 6)        /* tx ready int ena */
+#define NIOS_ASMI_IRRDY                (1 << 7)        /* rx ready int ena */
+#define NIOS_ASMI_IE           (1 << 8)        /* exception int ena */
+#define NIOS_ASMI_IEOP         (1 << 9)        /* rx eop int ena */
+#define NIOS_ASMI_SSO          (1 << 10)       /* slave select enable */
+
+/*------------------------------------------------------------------------
+ * JTAG UART
+ *----------------------------------------------------------------------*/
+typedef volatile struct nios_jtag_t {
+       unsigned short  rxcntl;                 /* Rx data/cntl reg */
+       unsigned short  txcntl;                 /* Tx data/cntl reg */
+       unsigned short  errcntl;                /* Err dta/cntl reg */
+}nios_jtag_t;
+
+/* status register */
+#define NIOS_JTAG_TRDY         (1 << 8)        /* tx ready bit */
+#define NIOS_JTAG_RRDY         (1 << 8)        /* rx ready bit */
+
 #endif /* __NIOSIO_H__ */