Changeset c882505 in mainline for kernel/genarch/src/drivers/pl011/pl011.c

Timestamp:

2013-03-26T17:44:16Z (11 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

44b2b78

Parents:

0dfa93b0

Message:

Merge arm926 and bcm2835 drivers for pl011 uart and move the code
under a generic directory

File:

• kernel/genarch/src/drivers/pl011/pl011.c (moved) (moved from kernel/genarch/src/drivers/bcm2835/pl011_uart.c ) (4 diffs)

kernel/genarch/src/drivers/pl011/pl011.c

@@ -32 +32 @@
 /**
  * @file
- * @brief PL011 on-chip UART (PrimeCell UART, PL011) driver.
+ * @brief ARM PrimeCell PL011 UART driver.
  */
 
-#include <genarch/drivers/bcm2835/pl011_uart.h>
+#include <genarch/drivers/pl011/pl011.h>
 #include <console/chardev.h>
 #include <console/console.h>
@@ -94 +94 @@
 }
 
-bool pl011_uart_init(pl011_uart_t *uart, inr_t interrupt, uintptr_t addr, size_t size)
+bool pl011_uart_init(pl011_uart_t *uart, inr_t interrupt, uintptr_t addr)
 {
         ASSERT(uart);
-        uart->regs = (void*)km_map(addr, size, PAGE_NOT_CACHEABLE);
-
+        uart->regs = (void*)km_map(addr, sizeof(pl011_uart_regs_t),
+                                   PAGE_NOT_CACHEABLE);
         ASSERT(uart->regs);
 
-        uart->regs->control = 0;
-        uart->regs->interrupt_clear = 0x7f;
-        uart->regs->int_baud_divisor = 1;
-        uart->regs->fract_baud_divisor = 40;
-        uart->regs->line_control_high = PL011_UART_CONTROLHI_FEN_FLAG |
-                (3 << PL011_UART_CONTROLHI_WLEN_SHIFT);
+        /* Disable UART */
+        uart->regs->control &= ~ PL011_UART_CONTROL_UARTEN_FLAG;
 
-        /* Enable TX and RX */
-        uart->regs->control = 0 |
+        /* Enable hw flow control */
+        uart->regs->control |=
+                PL011_UART_CONTROL_RTSE_FLAG |
+                PL011_UART_CONTROL_CTSE_FLAG;
+
+        /* Mask all interrupts */
+        uart->regs->interrupt_mask = 0;
+        /* Clear interrupts */
+        uart->regs->interrupt_clear = PL011_UART_INTERRUPT_ALL;
+        /* Enable UART, TX and RX */
+        uart->regs->control |=
                 PL011_UART_CONTROL_UARTEN_FLAG |
                 PL011_UART_CONTROL_TXE_FLAG |
                 PL011_UART_CONTROL_RXE_FLAG;
-
-        /* Mask all interrupts */
-        uart->regs->interrupt_mask = 0;
 
         outdev_initialize("pl011_uart_dev", &uart->outdev, &pl011_uart_ops);
@@ -127 +129 @@
         uart->irq.handler = pl011_uart_irq_handler;
         uart->irq.instance = uart;
+
         return true;
 }
@@ -137 +140 @@
         uart->indev = indev;
         irq_register(&uart->irq);
-        /* Enable receive interrupt */
-        uart->regs->interrupt_mask |= (PL011_UART_INTERRUPT_RX_FLAG |
-                                       PL011_UART_INTERRUPT_RT_FLAG);
+        /* Enable receive interrupts */
+        uart->regs->interrupt_mask |=
+                PL011_UART_INTERRUPT_RX_FLAG |
+                PL011_UART_INTERRUPT_RT_FLAG;
 }