diff for duplicates of <3383903.1R72kZGx62@avalon> diff --git a/a/1.txt b/N1/1.txt index 82c14d6..3d2e5d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,8 @@ On Thursday 19 November 2015 19:38:57 Geert Uytterhoeven wrote: > spin_lock_irqsave(&port->lock, flags); > - port->uartclk = clk_get_rate(sci_port->fclk); > + for (i = 0; i < SCI_NUM_CLKS; i++) -> + sci_port->clk_rates[i] > + clk_get_rate(sci_port->clks[i]); +> + sci_port->clk_rates[i] = +> + clk_get_rate(sci_port->clks[i]); > spin_unlock_irqrestore(&port->lock, flags); > } > @@ -145,7 +146,7 @@ On Thursday 19 November 2015 19:38:57 Geert Uytterhoeven wrote: > + unsigned long max_freq = 0; > + int best_clk = -1; > -> if ((termios->c_cflag & CSIZE) = CS7) +> if ((termios->c_cflag & CSIZE) == CS7) > smr_val |= SCSMR_CHR; > @@ -2007,35 +2030,59 @@ static void sci_set_termios(struct uart_port *port, > struct ktermios *termios, * that the previous boot loader has enabled @@ -244,7 +245,7 @@ On Thursday 19 November 2015 19:38:57 Geert Uytterhoeven wrote: > { > - /* Get the SCI functional clock. It's called "fck" on ARM. */ > - sci_port->fclk = devm_clk_get(dev, "fck"); -> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER) +> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) > - return -EPROBE_DEFER; > - if (!IS_ERR(sci_port->fclk)) > - return 0; @@ -259,13 +260,13 @@ On Thursday 19 November 2015 19:38:57 Geert Uytterhoeven wrote: > - * backward compatibility. > - */ > - sci_port->fclk = devm_clk_get(dev, "sci_ick"); -> - if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER) +> - if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) > - return -EPROBE_DEFER; > - if (!IS_ERR(sci_port->fclk)) > - return 0; > + for (i = 0; i < SCI_NUM_CLKS; i++) { > + clk = devm_clk_get(dev, clk_names[i]); -> + if (PTR_ERR(clk) = -EPROBE_DEFER) +> + if (PTR_ERR(clk) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > > - /* @@ -275,13 +276,13 @@ On Thursday 19 November 2015 19:38:57 Geert Uytterhoeven wrote: > - sci_port->fclk = devm_clk_get(dev, "peripheral_clk"); > - if (!IS_ERR(sci_port->fclk)) > - return 0; -> + if (IS_ERR(clk) && i = SCI_FCK) { +> + if (IS_ERR(clk) && i == SCI_FCK) { > + /* > + * "fck" used to be called "sci_ick", and we need to > + * maintain DT backward compatibility. > + */ > + clk = devm_clk_get(dev, "sci_ick"); -> + if (PTR_ERR(clk) = -EPROBE_DEFER) +> + if (PTR_ERR(clk) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + > + if (!IS_ERR(clk)) diff --git a/a/content_digest b/N1/content_digest index b7254bb..c0515cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01447958344-836-19-git-send-email-geert+renesas@glider.be\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 18/25] serial: sh-sci: Prepare for multiple clocks and baud rate generators\0" - "Date\0Thu, 19 Nov 2015 21:04:02 +0000\0" + "Date\0Thu, 19 Nov 2015 23:04:02 +0200\0" "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Simon Horman <horms@verge.net.au> @@ -115,7 +115,8 @@ "> \t\tspin_lock_irqsave(&port->lock, flags);\n" "> -\t\tport->uartclk = clk_get_rate(sci_port->fclk);\n" "> +\t\tfor (i = 0; i < SCI_NUM_CLKS; i++)\n" - "> +\t\t\tsci_port->clk_rates[i] > +\t\t\t\tclk_get_rate(sci_port->clks[i]);\n" + "> +\t\t\tsci_port->clk_rates[i] =\n" + "> +\t\t\t\tclk_get_rate(sci_port->clks[i]);\n" "> \t\tspin_unlock_irqrestore(&port->lock, flags);\n" "> \t}\n" "> \n" @@ -160,7 +161,7 @@ "> +\tunsigned long max_freq = 0;\n" "> +\tint best_clk = -1;\n" "> \n" - "> \tif ((termios->c_cflag & CSIZE) = CS7)\n" + "> \tif ((termios->c_cflag & CSIZE) == CS7)\n" "> \t\tsmr_val |= SCSMR_CHR;\n" "> @@ -2007,35 +2030,59 @@ static void sci_set_termios(struct uart_port *port,\n" "> struct ktermios *termios, * that the previous boot loader has enabled\n" @@ -259,7 +260,7 @@ "> {\n" "> -\t/* Get the SCI functional clock. It's called \"fck\" on ARM. */\n" "> -\tsci_port->fclk = devm_clk_get(dev, \"fck\");\n" - "> -\tif (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)\n" + "> -\tif (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)\n" "> -\t\treturn -EPROBE_DEFER;\n" "> -\tif (!IS_ERR(sci_port->fclk))\n" "> -\t\treturn 0;\n" @@ -274,13 +275,13 @@ "> -\t * backward compatibility.\n" "> -\t */\n" "> -\tsci_port->fclk = devm_clk_get(dev, \"sci_ick\");\n" - "> -\tif (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)\n" + "> -\tif (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)\n" "> -\t\treturn -EPROBE_DEFER;\n" "> -\tif (!IS_ERR(sci_port->fclk))\n" "> -\t\treturn 0;\n" "> +\tfor (i = 0; i < SCI_NUM_CLKS; i++) {\n" "> +\t\tclk = devm_clk_get(dev, clk_names[i]);\n" - "> +\t\tif (PTR_ERR(clk) = -EPROBE_DEFER)\n" + "> +\t\tif (PTR_ERR(clk) == -EPROBE_DEFER)\n" "> +\t\t\treturn -EPROBE_DEFER;\n" "> \n" "> -\t/*\n" @@ -290,13 +291,13 @@ "> -\tsci_port->fclk = devm_clk_get(dev, \"peripheral_clk\");\n" "> -\tif (!IS_ERR(sci_port->fclk))\n" "> -\t\treturn 0;\n" - "> +\t\tif (IS_ERR(clk) && i = SCI_FCK) {\n" + "> +\t\tif (IS_ERR(clk) && i == SCI_FCK) {\n" "> +\t\t\t/*\n" "> +\t\t\t * \"fck\" used to be called \"sci_ick\", and we need to\n" "> +\t\t\t * maintain DT backward compatibility.\n" "> +\t\t\t */\n" "> +\t\t\tclk = devm_clk_get(dev, \"sci_ick\");\n" - "> +\t\t\tif (PTR_ERR(clk) = -EPROBE_DEFER)\n" + "> +\t\t\tif (PTR_ERR(clk) == -EPROBE_DEFER)\n" "> +\t\t\t\treturn -EPROBE_DEFER;\n" "> +\n" "> +\t\t\tif (!IS_ERR(clk))\n" @@ -337,4 +338,4 @@ "\n" Laurent Pinchart -354586f037c4f972716df2f377277a30db2591cbb97651195b6d629b93563e7f +e6701960d6c21ff2011ec9509eab1a1bfe8d2fcb1225377e091a891e50114918
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.