From: Andy Shevchenko Date: Thu, 28 Feb 2019 15:19:54 +0000 (+0200) Subject: x86: acpi: Not every platform has serial console a first device X-Git-Tag: v2019.04-rc4~9^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edf18a83f8dc993279947cfc7faaba7dedf1ad82;p=platform%2Fkernel%2Fu-boot.git x86: acpi: Not every platform has serial console a first device We may not do an assumption that current console device is always a first of UCLASS_SERIAL one. For example, on properly described Intel Edison board the console UART is a third one. Use current serial device as described in global data. Fixes: a61cbad78e67 ("dm: serial: Adjust serial_getinfo() to use proper API") Cc: Simon Glass Signed-off-by: Andy Shevchenko Reviewed-by: Bin Meng --- diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 04058a6..270274f 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -347,7 +347,7 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) uint serial_width; int access_size; int space_id; - int ret; + int ret = -ENODEV; /* Fill out header fields */ acpi_fill_header(header, "SPCR"); @@ -355,8 +355,8 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) header->revision = 2; /* Read the device once, here. It is reused below */ - ret = uclass_first_device_err(UCLASS_SERIAL, &dev); - if (!ret) + dev = gd->cur_serial_dev; + if (dev) ret = serial_getinfo(dev, &serial_info); if (ret) serial_info.type = SERIAL_CHIP_UNKNOWN;