Merge tag 'video-for-2019.07' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index df35ac9114e5e0d32dffa9a0f284ca673c46a825..a435e68005ff8dbc541634385fe0838cb1977016 100644 (file)
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -178,7 +178,7 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
        writel(UCR1_UARTEN, &base->cr1);
 }
 
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 
 #ifndef CONFIG_MXC_UART_BASE
 #error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
@@ -260,7 +260,7 @@ __weak struct serial_device *default_serial_console(void)
 }
 #endif
 
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 
 int mxc_serial_setbrg(struct udevice *dev, int baudrate)
 {
@@ -342,6 +342,7 @@ static int mxc_serial_ofdata_to_platdata(struct udevice *dev)
 }
 
 static const struct udevice_id mxc_serial_ids[] = {
+       { .compatible = "fsl,imx6sx-uart" },
        { .compatible = "fsl,imx6ul-uart" },
        { .compatible = "fsl,imx7d-uart" },
        { .compatible = "fsl,imx6q-uart" },