diff for duplicates of <1491231478.3480.12.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index c929ff0..d1d4e6c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,24 +5,24 @@ On Fri, 2017-03-31 at 18:54 +0200, Helmut Klein wrote: > > Signed-off-by: Helmut Klein <hgkr.klein@gmail.com> > --- -> ?drivers/tty/serial/meson_uart.c | 10 ++++++++++ -> ?1 file changed, 10 insertions(+) +> drivers/tty/serial/meson_uart.c | 10 ++++++++++ +> 1 file changed, 10 insertions(+) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 60f16795d16b..cb99112288eb 100644 > --- a/drivers/tty/serial/meson_uart.c > +++ b/drivers/tty/serial/meson_uart.c > @@ -600,6 +600,7 @@ static int meson_uart_probe(struct platform_device *pdev) -> ? struct resource *res_mem, *res_irq; -> ? struct uart_port *port; -> ? struct clk *clk; +> struct resource *res_mem, *res_irq; +> struct uart_port *port; +> struct clk *clk; > + struct clk *core_clk; -> ? int ret = 0; +> int ret = 0; > -> ? if (pdev->dev.of_node) +> if (pdev->dev.of_node) > @@ -625,6 +626,15 @@ static int meson_uart_probe(struct platform_device *pdev) -> ? if (!port) -> ? return -ENOMEM; +> if (!port) +> return -ENOMEM; > > + core_clk = devm_clk_get(&pdev->dev, "core"); > + if (!IS_ERR(core_clk)) { @@ -45,7 +45,7 @@ Sorry I did not notice it on the v2. > + } > + } > + -> ? clk = clk_get(&pdev->dev, NULL); +> clk = clk_get(&pdev->dev, NULL); I still think you should name this one. Otherwise, what the non AO UART will get here will depends on the order it was declared in DT. @@ -54,8 +54,8 @@ To answer your question from the v2, yes I think it is ok to add clock-names to the AO-UART. You are doing it for non AO ones so, why not ? -> ? if (IS_ERR(clk)) -> ? return PTR_ERR(clk); +> if (IS_ERR(clk)) +> return PTR_ERR(clk); > -- > 2.11.0 > diff --git a/a/content_digest b/N1/content_digest index c93c160..238dfae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\020170331165437.26227-1-hgkr.klein@gmail.com\0" "ref\020170331165437.26227-4-hgkr.klein@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v3 3/4] tty/serial: meson_uart: add the core clock handling to the driver\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v3 3/4] tty/serial: meson_uart: add the core clock handling to the driver\0" "Date\0Mon, 03 Apr 2017 16:57:58 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Helmut Klein <hgkr.klein@gmail.com>" + gregkh@linuxfoundation.org + carlo@caione.org + " khilman@baylibre.com\0" + "Cc\0linux-serial@vger.kernel.org" + linux-amlogic@lists.infradead.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2017-03-31 at 18:54 +0200, Helmut Klein wrote:\n" @@ -13,24 +20,24 @@ "> \n" "> Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>\n" "> ---\n" - "> ?drivers/tty/serial/meson_uart.c | 10 ++++++++++\n" - "> ?1 file changed, 10 insertions(+)\n" + "> \302\240drivers/tty/serial/meson_uart.c | 10 ++++++++++\n" + "> \302\2401 file changed, 10 insertions(+)\n" "> \n" "> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c\n" "> index 60f16795d16b..cb99112288eb 100644\n" "> --- a/drivers/tty/serial/meson_uart.c\n" "> +++ b/drivers/tty/serial/meson_uart.c\n" "> @@ -600,6 +600,7 @@ static int meson_uart_probe(struct platform_device *pdev)\n" - "> ?\tstruct resource *res_mem, *res_irq;\n" - "> ?\tstruct uart_port *port;\n" - "> ?\tstruct clk *clk;\n" + "> \302\240\tstruct resource *res_mem, *res_irq;\n" + "> \302\240\tstruct uart_port *port;\n" + "> \302\240\tstruct clk *clk;\n" "> +\tstruct clk *core_clk;\n" - "> ?\tint ret = 0;\n" + "> \302\240\tint ret = 0;\n" "> \n" - "> ?\tif (pdev->dev.of_node)\n" + "> \302\240\tif (pdev->dev.of_node)\n" "> @@ -625,6 +626,15 @@ static int meson_uart_probe(struct platform_device *pdev)\n" - "> ?\tif (!port)\n" - "> ?\t\treturn -ENOMEM;\n" + "> \302\240\tif (!port)\n" + "> \302\240\t\treturn -ENOMEM;\n" "> \n" "> +\tcore_clk = devm_clk_get(&pdev->dev, \"core\");\n" "> +\tif (!IS_ERR(core_clk)) {\n" @@ -53,7 +60,7 @@ "> +\t\t}\n" "> +\t}\n" "> +\n" - "> ?\tclk = clk_get(&pdev->dev, NULL);\n" + "> \302\240\tclk = clk_get(&pdev->dev, NULL);\n" "\n" "I still think you should name this one. Otherwise, what the non AO UART will get\n" "here will depends on the order it was declared in DT.\n" @@ -62,10 +69,10 @@ "the AO-UART. You are doing it for non AO ones so, why not ?\n" "\n" "\n" - "> ?\tif (IS_ERR(clk))\n" - "> ?\t\treturn PTR_ERR(clk);\n" + "> \302\240\tif (IS_ERR(clk))\n" + "> \302\240\t\treturn PTR_ERR(clk);\n" "> --\n" "> 2.11.0\n" > -9528bd67c14f073b59ef3beea9a63d28403c26feac25efa07448a2be92edad76 +7410c46da77afb01c42c25baf8582e033f145aa084d38316cadc345b156a24d4
diff --git a/a/content_digest b/N2/content_digest index c93c160..b305067 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v3 3/4] tty/serial: meson_uart: add the core clock handling to the driver\0" "Date\0Mon, 03 Apr 2017 16:57:58 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 2017-03-31 at 18:54 +0200, Helmut Klein wrote:\n" @@ -68,4 +68,4 @@ "> 2.11.0\n" > -9528bd67c14f073b59ef3beea9a63d28403c26feac25efa07448a2be92edad76 +6c70cc0286c05a397f110104b7c8c82e27bd1f74ece72e597e1bfdc7adfb77e2
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.