Changeset 8ab339e in mainline for kernel/genarch/include/drivers/amdm37x/uart_regs.h

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/genarch/include/drivers/amdm37x/uart_regs.h (moved) (moved from kernel/genarch/include/drivers/amdm37x_uart/amdm37x_uart.h ) (4 diffs)

kernel/genarch/include/drivers/amdm37x/uart_regs.h

@@ -31 +31 @@
 /**
  * @file
- * @brief Texas Instruments AMDM37x on-chip interrupt controller driver.
+ * @brief Texas Instruments AMDM37x UART memory mapped registers.
  */
 
@@ -40 +40 @@
 #include <console/chardev.h>
 #include <ddi/irq.h>
-
-/* AMDM37x TRM p. 2950 */
-#define AMDM37x_UART1_BASE_ADDRESS   0x4806a000
-#define AMDM37x_UART1_SIZE   1024
-#define AMDM37x_UART1_IRQ   72 /* AMDM37x TRM p. 2418 */
-
-#define AMDM37x_UART2_BASE_ADDRESS   0x4806b000
-#define AMDM37x_UART2_SIZE   1024
-#define AMDM37x_UART2_IRQ   73 /* AMDM37x TRM p. 2418 */
-
-#define AMDM37x_UART3_BASE_ADDRESS   0x49020000
-#define AMDM37x_UART3_SIZE   1024
-#define AMDM37x_UART3_IRQ   74 /* AMDM37x TRM p. 2418 */
-
-#define AMDM37x_UART4_BASE_ADDRESS   0x49042000
-#define AMDM37x_UART4_SIZE   1024
-#define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
 
 typedef struct {
@@ -343 +326 @@
 
                 /** BOF control register (IrDA only) */
-                ioport32_t blr; /* UART3 sepcific */
+                ioport32_t blr; /* UART3 specific */
 #define AMDM37x_IRDA_BLR_XBOF_TYPE_FLAG   (1 << 6)
 #define AMDM37x_IRDA_BLR_STS_FIFO_RESET   (1 << 7)
@@ -442 +425 @@
 } amdm37x_uart_regs_t;
 
-typedef struct {
-        amdm37x_uart_regs_t *regs;
-        indev_t *indev;
-        outdev_t outdev;
-        irq_t irq;
-} amdm37x_uart_t;
-
-
-bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
-void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
-
 #endif