From 68c851bcd702e7816cdb6e504f7386ec404ecf13 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Tue, 12 Jun 2018 22:06:09 +0200 Subject: src: Get rid of device_t Use of device_t is deprecated. Change-Id: I6adc0429ae9ecc8f726d6167a6458d9333dc515f Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/27036 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/intel/apollolake/uart.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/soc/intel/apollolake') diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c index 54b280d7b8..a59b567e56 100644 --- a/src/soc/intel/apollolake/uart.c +++ b/src/soc/intel/apollolake/uart.c @@ -60,7 +60,11 @@ static inline int invalid_uart_for_console(void) void pch_uart_init(void) { uintptr_t base = CONFIG_CONSOLE_UART_BASE_ADDRESS; - device_t uart = _PCH_DEV(UART, CONFIG_UART_FOR_CONSOLE & 3); +#if defined(__SIMPLE_DEVICE__) + pci_devfn_t uart = _PCH_DEV(UART, CONFIG_UART_FOR_CONSOLE & 3); +#else + struct device *uart = _PCH_DEV(UART, CONFIG_UART_FOR_CONSOLE & 3); +#endif /* Get a 0-based pad index. See invalid_uart_for_console() above. */ const int pad_index = CONFIG_UART_FOR_CONSOLE - 1; -- cgit v1.2.3