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 4a05ea44ce99fed335c722fb5791f5c27b5bbb8e..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;
 
@@ -163,6 +163,18 @@ DEBUG_UART_FUNCS
 
 #endif /* CONFIG_DEBUG_UART_SANDBOX */
 
+static int sandbox_serial_getconfig(struct udevice *dev, uint *serial_config)
+{
+       uint config = SERIAL_DEFAULT_CONFIG;
+
+       if (!serial_config)
+               return -EINVAL;
+
+       *serial_config = config;
+
+       return 0;
+}
+
 static int sandbox_serial_setconfig(struct udevice *dev, uint serial_config)
 {
        u8 parity = SERIAL_GET_PARITY(serial_config);
@@ -176,6 +188,27 @@ static int sandbox_serial_setconfig(struct udevice *dev, uint serial_config)
        return 0;
 }
 
+static int sandbox_serial_getinfo(struct udevice *dev,
+                                 struct serial_device_info *serial_info)
+{
+       struct serial_device_info info = {
+               .type = SERIAL_CHIP_UNKNOWN,
+               .addr_space = SERIAL_ADDRESS_SPACE_IO,
+               .addr = SERIAL_DEFAULT_ADDRESS,
+               .reg_width = 1,
+               .reg_offset = 0,
+               .reg_shift = 0,
+               .clock = SERIAL_DEFAULT_CLOCK,
+       };
+
+       if (!serial_info)
+               return -EINVAL;
+
+       *serial_info = info;
+
+       return 0;
+}
+
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 static const char * const ansi_colour[] = {
        "black", "red", "green", "yellow", "blue", "megenta", "cyan",
@@ -188,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);
@@ -207,7 +242,9 @@ static const struct dm_serial_ops sandbox_serial_ops = {
        .putc = sandbox_serial_putc,
        .pending = sandbox_serial_pending,
        .getc = sandbox_serial_getc,
+       .getconfig = sandbox_serial_getconfig,
        .setconfig = sandbox_serial_setconfig,
+       .getinfo = sandbox_serial_getinfo,
 };
 
 static const struct udevice_id sandbox_serial_ids[] = {