diff options
-rw-r--r-- | core/arch/arm/plat-stm32mp1/main.c | 2 | ||||
-rw-r--r-- | core/drivers/stm32_uart.c | 14 | ||||
-rw-r--r-- | core/include/drivers/stm32_uart.h | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/core/arch/arm/plat-stm32mp1/main.c b/core/arch/arm/plat-stm32mp1/main.c index 014b95ef..9f4b332a 100644 --- a/core/arch/arm/plat-stm32mp1/main.c +++ b/core/arch/arm/plat-stm32mp1/main.c @@ -26,7 +26,7 @@ register_phys_mem(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE, CONSOLE_UART_SIZE); register_phys_mem(MEM_AREA_IO_SEC, GIC_BASE, GIC_SIZE); register_phys_mem(MEM_AREA_IO_SEC, TAMP_BASE, SMALL_PAGE_SIZE); -static struct console_pdata console_data; +static struct stm32_uart_pdata console_data; static void main_fiq(void); diff --git a/core/drivers/stm32_uart.c b/core/drivers/stm32_uart.c index 53d9c1e6..6fed9146 100644 --- a/core/drivers/stm32_uart.c +++ b/core/drivers/stm32_uart.c @@ -4,6 +4,7 @@ */ #include <compiler.h> +#include <console.h> #include <drivers/serial.h> #include <drivers/stm32_uart.h> #include <io.h> @@ -40,8 +41,9 @@ static vaddr_t loc_chip_to_base(struct serial_chip *chip) { - struct console_pdata *pd = - container_of(chip, struct console_pdata, chip); + struct stm32_uart_pdata *pd; + + pd = container_of(chip, struct stm32_uart_pdata, chip); return io_pa_or_va(&pd->base); } @@ -85,17 +87,17 @@ static int loc_getchar(struct serial_chip *chip) return read32(base + UART_REG_RDR) & 0xff; } -static const struct serial_ops serial_ops = { +static const struct serial_ops stm32_uart_serial_ops = { .flush = loc_flush, .putc = loc_putc, .have_rx_data = loc_have_rx_data, .getchar = loc_getchar, }; -KEEP_PAGER(serial_ops); +KEEP_PAGER(stm32_uart_serial_ops); -void stm32_uart_init(struct console_pdata *pd, vaddr_t base) +void stm32_uart_init(struct stm32_uart_pdata *pd, vaddr_t base) { pd->base.pa = base; - pd->chip.ops = &serial_ops; + pd->chip.ops = &stm32_uart_serial_ops; } diff --git a/core/include/drivers/stm32_uart.h b/core/include/drivers/stm32_uart.h index 58c7077d..f9232bec 100644 --- a/core/include/drivers/stm32_uart.h +++ b/core/include/drivers/stm32_uart.h @@ -8,11 +8,12 @@ #include <drivers/serial.h> -struct console_pdata { +struct stm32_uart_pdata { struct io_pa_va base; struct serial_chip chip; + bool secure; }; -void stm32_uart_init(struct console_pdata *pd, vaddr_t base); +void stm32_uart_init(struct stm32_uart_pdata *pd, vaddr_t base); #endif /*__STM32_UART_H__*/ |