aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/arm/pl061/pl061_gpio.c2
-rw-r--r--drivers/ti/uart/aarch64/16550_console.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/arm/pl061/pl061_gpio.c b/drivers/arm/pl061/pl061_gpio.c
index fca00565d..327c68e11 100644
--- a/drivers/arm/pl061/pl061_gpio.c
+++ b/drivers/arm/pl061/pl061_gpio.c
@@ -39,6 +39,7 @@
#include <gpio.h>
#include <mmio.h>
#include <pl061_gpio.h>
+#include <utils.h>
#if !PLAT_PL061_MAX_GPIOS
# define PLAT_PL061_MAX_GPIOS 32
@@ -52,7 +53,6 @@ CASSERT(PLAT_PL061_MAX_GPIOS > 0, assert_plat_pl061_max_gpios);
#define PL061_GPIO_DIR 0x400
#define GPIOS_PER_PL061 8
-#define BIT(nr) (1UL << (nr))
static int pl061_get_direction(int gpio);
static void pl061_set_direction(int gpio, int direction);
diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S
index 053538143..846648290 100644
--- a/drivers/ti/uart/aarch64/16550_console.S
+++ b/drivers/ti/uart/aarch64/16550_console.S
@@ -146,7 +146,7 @@ endfunc console_core_putc
func console_core_getc
/* Check if the receive FIFO is empty */
1: ldr w1, [x0, #UARTLSR]
- tbz w1, #UARTLSR_RDR, 1b
+ tbz w1, #UARTLSR_RDR_BIT, 1b
ldr w0, [x0, #UARTRX]
ret
getc_error: