diff options
| author | danh-arm <dan.handley@arm.com> | 2016-02-26 09:45:20 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-02-26 09:45:20 +0000 |
| commit | d698ee7f8c4c9ce8ce42fb5e3c2fccdcb70b9ba9 (patch) | |
| tree | b8ce011973e99fe553a4937864ba1e15a139cda2 /drivers | |
| parent | 9931932bfd3429aa8e98c33a26dfafcdbda71a43 (diff) | |
| parent | 8dadabd288be998e7930ce81e409f4949631056b (diff) | |
Merge pull request #534 from jcastillo-arm/jc/fix_pl011
Fix potential deadlock in PL011 init function
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/pl011/pl011_console.S | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/arm/pl011/pl011_console.S b/drivers/arm/pl011/pl011_console.S index f29f895b..5e97e911 100644 --- a/drivers/arm/pl011/pl011_console.S +++ b/drivers/arm/pl011/pl011_console.S @@ -69,15 +69,6 @@ func console_core_init mov w4, #PL011_UARTCR_UARTEN bic w3, w3, w4 str w3, [x0, #UARTCR] - /* Flush the transmit FIFO */ - ldr w3, [x0, #UARTLCR_H] - mov w4, #PL011_UARTLCR_H_FEN - bic w3, w3, w4 - str w3, [x0, #UARTLCR_H] - /* Wait for the end of Tx of current character */ -busy_loop: - ldr w3, [x0, #UARTFR] - tbnz w3, #PL011_UARTFR_BUSY_BIT, busy_loop /* Program the baudrate */ /* Divisor = (Uart clock * 4) / baudrate */ lsl w1, w1, #2 |