arm: imx6ul: Add Engicam GEAM6UL Starter Kit initial support

[u-boot] / drivers / serial / ns16550.c

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 765499dab64648fc1c5082f6ddc6526635aa7700..6e9b946bf7b9058a67bb41cf127cc13ebfdf2565 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -13,7 +13,6 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/types.h>
-#include <linux/compiler.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -354,8 +353,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct ns16550_platdata *plat = dev->platdata;
        fdt_addr_t addr;
-       __maybe_unused struct clk clk;
-       __maybe_unused int err;
+       struct clk clk;
+       int err;
 
        /* try Processor Local Bus device first */
        addr = dev_get_addr(dev);
@@ -402,17 +401,15 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
                                         "reg-shift", 0);
 
-#ifdef CONFIG_CLK
        err = clk_get_by_index(dev, 0, &clk);
        if (!err) {
                err = clk_get_rate(&clk);
                if (!IS_ERR_VALUE(err))
                        plat->clock = err;
-       } else if (err != -ENODEV && err != -ENOSYS) {
+       } else if (err != -ENOENT && err != -ENODEV && err != -ENOSYS) {
                debug("ns16550 failed to get clock\n");
                return err;
        }
-#endif
 
        if (!plat->clock)
                plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,