Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / drivers / serial / sandbox.c

diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 33102fc872f20fd1b1533403ed9c33022fc7df41..545ff3f74724ceafea73a78d87d90e5f02cb6373 100644 (file)
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
  *   serial_buf_write           == serial_buf_read -> empty buffer
  *   (serial_buf_write + 1) % 16 == serial_buf_read -> full buffer
  */
-static char serial_buf[16];
+static unsigned char serial_buf[16];
 static unsigned int serial_buf_write;
 static unsigned int serial_buf_read;
 
@@ -198,6 +198,7 @@ static int sandbox_serial_getinfo(struct udevice *dev,
                .reg_width = 1,
                .reg_offset = 0,
                .reg_shift = 0,
+               .clock = SERIAL_DEFAULT_CLOCK,
        };
 
        if (!serial_info)
@@ -220,6 +221,8 @@ static int sandbox_serial_ofdata_to_platdata(struct udevice *dev)
        const char *colour;
        int i;
 
+       if (CONFIG_IS_ENABLED(OF_PLATDATA))
+               return 0;
        plat->colour = -1;
        colour = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
                             "sandbox,text-colour", NULL);