target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch

   1 From 558ca1294aa2bf7f29d55361d2f18c6dc534e1d6 Mon Sep 17 00:00:00 2001
   2 From: Biwen Li <biwen.li@nxp.com>
   3 Date: Tue, 30 Oct 2018 18:28:33 +0800
   4 Subject: [PATCH 39/40] uart: support layerscape
   5 This is an integrated patch of uart for layerscape
   6
   7 Signed-off-by: Sriram Dash <Sriram.dash@nxp.com>
   8 Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
   9 Signed-off-by: Biwen Li <biwen.li@nxp.com>
  10 ---
  11  drivers/tty/serial/fsl_lpuart.c | 15 +++++++++------
  12  1 file changed, 9 insertions(+), 6 deletions(-)
  13
  14 --- a/drivers/tty/serial/fsl_lpuart.c
  15 +++ b/drivers/tty/serial/fsl_lpuart.c
  16 @@ -236,6 +236,8 @@
  17  /* IMX lpuart has four extra unused regs located at the beginning */
  18  #define IMX_REG_OFF    0x10
  19
  20 +static DECLARE_BITMAP(linemap, UART_NR);
  21 +
  22  struct lpuart_port {
  23         struct uart_port        port;
  24         struct clk              *clk;
  25 @@ -2153,13 +2155,13 @@ static int lpuart_probe(struct platform_
  26
  27         ret = of_alias_get_id(np, "serial");
  28         if (ret < 0) {
  29 -               dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
  30 -               return ret;
  31 -       }
  32 -       if (ret >= ARRAY_SIZE(lpuart_ports)) {
  33 -               dev_err(&pdev->dev, "serial%d out of range\n", ret);
  34 -               return -EINVAL;
  35 +               ret = find_first_zero_bit(linemap, UART_NR);
  36 +               if (ret >= UART_NR) {
  37 +                       dev_err(&pdev->dev, "port line is full, add device failed\n");
  38 +                       return ret;
  39 +               }
  40         }
  41 +       set_bit(ret, linemap);
  42         sport->port.line = ret;
  43         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  44         sport->port.membase = devm_ioremap_resource(&pdev->dev, res);
  45 @@ -2250,6 +2252,7 @@ static int lpuart_remove(struct platform
  46         struct lpuart_port *sport = platform_get_drvdata(pdev);
  47
  48         uart_remove_one_port(&lpuart_reg, &sport->port);
  49 +       clear_bit(sport->port.line, linemap);
  50
  51         clk_disable_unprepare(sport->clk);
  52