diff for duplicates of <1497260344.3086.8.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index c23294c..9206b41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,9 +7,9 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > Signed-off-by: Helmut Klein <hgkr.klein@gmail.com> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- -> ?drivers/tty/serial/meson_uart.c | 109 +++++++++++++++++++++++++++++++++++++ +> drivers/tty/serial/meson_uart.c | 109 +++++++++++++++++++++++++++++++++++++ > --- -> ?1 file changed, 103 insertions(+), 6 deletions(-) +> 1 file changed, 103 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 60f1679..d2c8136 100644 @@ -17,30 +17,30 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > +++ b/drivers/tty/serial/meson_uart.c > @@ -579,8 +579,12 @@ static void meson_serial_early_console_write(struct > console *co, -> ? device->con->write = meson_serial_early_console_write; -> ? return 0; -> ?} +> device->con->write = meson_serial_early_console_write; +> return 0; +> } > +/* Legacy bindings, should be removed when no more used */ -> ?OF_EARLYCON_DECLARE(meson, "amlogic,meson-uart", -> ? ????meson_serial_early_console_setup); +> OF_EARLYCON_DECLARE(meson, "amlogic,meson-uart", +> meson_serial_early_console_setup); > +/* Stable bindings */ > +OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart", -> + ????meson_serial_early_console_setup); -> ? -> ?#define MESON_SERIAL_CONSOLE (&meson_serial_console) -> ?#else +> + meson_serial_early_console_setup); +> +> #define MESON_SERIAL_CONSOLE (&meson_serial_console) +> #else > @@ -595,11 +599,95 @@ static void meson_serial_early_console_write(struct > console *co, -> ? .cons = MESON_SERIAL_CONSOLE, -> ?}; -> ? +> .cons = MESON_SERIAL_CONSOLE, +> }; +> > +/* > + * This function gets clocks in the legacy non-stable DT bindings. > + * This code will be remove once all the platforms switch to the > + * new DT bindings. > + */ > +static int meson_uart_probe_clocks_legacy(struct platform_device *pdev, -> + ??struct uart_port *port) +> + struct uart_port *port) > +{ > + struct clk *clk = NULL; > + int ret; @@ -65,7 +65,7 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > +} > + > +static int meson_uart_probe_clocks(struct platform_device *pdev, -> + ???struct uart_port *port) +> + struct uart_port *port) > +{ > + struct clk *clk_xtal = NULL; > + struct clk *clk_pclk = NULL; @@ -135,19 +135,19 @@ Could be done in separate patch. > + return 0; > +} > + -> ?static int meson_uart_probe(struct platform_device *pdev) -> ?{ -> ? struct resource *res_mem, *res_irq; -> ? struct uart_port *port; +> static int meson_uart_probe(struct platform_device *pdev) +> { +> struct resource *res_mem, *res_irq; +> struct uart_port *port; > - struct clk *clk; -> ? int ret = 0; -> ? -> ? if (pdev->dev.of_node) +> int ret = 0; +> +> if (pdev->dev.of_node) > @@ -625,11 +713,15 @@ static int meson_uart_probe(struct platform_device > *pdev) -> ? if (!port) -> ? return -ENOMEM; -> ? +> if (!port) +> return -ENOMEM; +> > - clk = clk_get(&pdev->dev, NULL); > - if (IS_ERR(clk)) > - return PTR_ERR(clk); @@ -159,25 +159,25 @@ Could be done in separate patch. > + > + if (ret) > + return ret; -> ? +> > - port->uartclk = clk_get_rate(clk); -> ? port->iotype = UPIO_MEM; -> ? port->mapbase = res_mem->start; -> ? port->irq = res_irq->start; +> port->iotype = UPIO_MEM; +> port->mapbase = res_mem->start; +> port->irq = res_irq->start; > @@ -668,9 +760,14 @@ static int meson_uart_remove(struct platform_device > *pdev) -> ? return 0; -> ?} -> ? +> return 0; +> } +> > - -> ?static const struct of_device_id meson_uart_dt_match[] = { +> static const struct of_device_id meson_uart_dt_match[] = { > + /* Legacy bindings, should be removed when no more used */ -> ? { .compatible = "amlogic,meson-uart" }, +> { .compatible = "amlogic,meson-uart" }, > + /* Stable bindings */ > + { .compatible = "amlogic,meson6-uart" }, > + { .compatible = "amlogic,meson8-uart" }, > + { .compatible = "amlogic,meson8b-uart" }, > + { .compatible = "amlogic,meson-gx-uart" }, -> ? { /* sentinel */ }, -> ?}; -> ?MODULE_DEVICE_TABLE(of, meson_uart_dt_match); +> { /* sentinel */ }, +> }; +> MODULE_DEVICE_TABLE(of, meson_uart_dt_match); diff --git a/a/content_digest b/N1/content_digest index eb757f5..ae3adff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-3-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 2/7] tty/serial: meson_uart: update to stable bindings\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v4 2/7] tty/serial: meson_uart: update to stable bindings\0" "Date\0Mon, 12 Jun 2017 11:39:04 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong@baylibre.com>" + gregkh@linuxfoundation.org + " khilman@baylibre.com\0" + "Cc\0linux-kernel@vger.kernel.org" + Helmut Klein <hgkr.klein@gmail.com> + linux-serial@vger.kernel.org + linux-amlogic@lists.infradead.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -15,9 +22,9 @@ "> Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>\n" "> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" "> ---\n" - "> ?drivers/tty/serial/meson_uart.c | 109 +++++++++++++++++++++++++++++++++++++\n" + "> \302\240drivers/tty/serial/meson_uart.c | 109 +++++++++++++++++++++++++++++++++++++\n" "> ---\n" - "> ?1 file changed, 103 insertions(+), 6 deletions(-)\n" + "> \302\2401 file changed, 103 insertions(+), 6 deletions(-)\n" "> \n" "> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c\n" "> index 60f1679..d2c8136 100644\n" @@ -25,30 +32,30 @@ "> +++ b/drivers/tty/serial/meson_uart.c\n" "> @@ -579,8 +579,12 @@ static void meson_serial_early_console_write(struct\n" "> console *co,\n" - "> ?\tdevice->con->write = meson_serial_early_console_write;\n" - "> ?\treturn 0;\n" - "> ?}\n" + "> \302\240\tdevice->con->write = meson_serial_early_console_write;\n" + "> \302\240\treturn 0;\n" + "> \302\240}\n" "> +/* Legacy bindings, should be removed when no more used */\n" - "> ?OF_EARLYCON_DECLARE(meson, \"amlogic,meson-uart\",\n" - "> ?\t\t????meson_serial_early_console_setup);\n" + "> \302\240OF_EARLYCON_DECLARE(meson, \"amlogic,meson-uart\",\n" + "> \302\240\t\t\302\240\302\240\302\240\302\240meson_serial_early_console_setup);\n" "> +/* Stable bindings */\n" "> +OF_EARLYCON_DECLARE(meson, \"amlogic,meson-ao-uart\",\n" - "> +\t\t????meson_serial_early_console_setup);\n" - "> ?\n" - "> ?#define MESON_SERIAL_CONSOLE\t(&meson_serial_console)\n" - "> ?#else\n" + "> +\t\t\302\240\302\240\302\240\302\240meson_serial_early_console_setup);\n" + "> \302\240\n" + "> \302\240#define MESON_SERIAL_CONSOLE\t(&meson_serial_console)\n" + "> \302\240#else\n" "> @@ -595,11 +599,95 @@ static void meson_serial_early_console_write(struct\n" "> console *co,\n" - "> ?\t.cons\t\t= MESON_SERIAL_CONSOLE,\n" - "> ?};\n" - "> ?\n" + "> \302\240\t.cons\t\t= MESON_SERIAL_CONSOLE,\n" + "> \302\240};\n" + "> \302\240\n" "> +/*\n" "> + * This function gets clocks in the legacy non-stable DT bindings.\n" "> + * This code will be remove once all the platforms switch to the\n" "> + * new DT bindings.\n" "> + */\n" "> +static int meson_uart_probe_clocks_legacy(struct platform_device *pdev,\n" - "> +\t\t\t\t\t??struct uart_port *port)\n" + "> +\t\t\t\t\t\302\240\302\240struct uart_port *port)\n" "> +{\n" "> +\tstruct clk *clk = NULL;\n" "> +\tint ret;\n" @@ -73,7 +80,7 @@ "> +}\n" "> +\n" "> +static int meson_uart_probe_clocks(struct platform_device *pdev,\n" - "> +\t\t\t\t???struct uart_port *port)\n" + "> +\t\t\t\t\302\240\302\240\302\240struct uart_port *port)\n" "> +{\n" "> +\tstruct clk *clk_xtal = NULL;\n" "> +\tstruct clk *clk_pclk = NULL;\n" @@ -143,19 +150,19 @@ "> +\treturn 0;\n" "> +}\n" "> +\n" - "> ?static int meson_uart_probe(struct platform_device *pdev)\n" - "> ?{\n" - "> ?\tstruct resource *res_mem, *res_irq;\n" - "> ?\tstruct uart_port *port;\n" + "> \302\240static int meson_uart_probe(struct platform_device *pdev)\n" + "> \302\240{\n" + "> \302\240\tstruct resource *res_mem, *res_irq;\n" + "> \302\240\tstruct uart_port *port;\n" "> -\tstruct clk *clk;\n" - "> ?\tint ret = 0;\n" - "> ?\n" - "> ?\tif (pdev->dev.of_node)\n" + "> \302\240\tint ret = 0;\n" + "> \302\240\n" + "> \302\240\tif (pdev->dev.of_node)\n" "> @@ -625,11 +713,15 @@ static int meson_uart_probe(struct platform_device\n" "> *pdev)\n" - "> ?\tif (!port)\n" - "> ?\t\treturn -ENOMEM;\n" - "> ?\n" + "> \302\240\tif (!port)\n" + "> \302\240\t\treturn -ENOMEM;\n" + "> \302\240\n" "> -\tclk = clk_get(&pdev->dev, NULL);\n" "> -\tif (IS_ERR(clk))\n" "> -\t\treturn PTR_ERR(clk);\n" @@ -167,27 +174,27 @@ "> +\n" "> +\tif (ret)\n" "> +\t\treturn ret;\n" - "> ?\n" + "> \302\240\n" "> -\tport->uartclk = clk_get_rate(clk);\n" - "> ?\tport->iotype = UPIO_MEM;\n" - "> ?\tport->mapbase = res_mem->start;\n" - "> ?\tport->irq = res_irq->start;\n" + "> \302\240\tport->iotype = UPIO_MEM;\n" + "> \302\240\tport->mapbase = res_mem->start;\n" + "> \302\240\tport->irq = res_irq->start;\n" "> @@ -668,9 +760,14 @@ static int meson_uart_remove(struct platform_device\n" "> *pdev)\n" - "> ?\treturn 0;\n" - "> ?}\n" - "> ?\n" + "> \302\240\treturn 0;\n" + "> \302\240}\n" + "> \302\240\n" "> -\n" - "> ?static const struct of_device_id meson_uart_dt_match[] = {\n" + "> \302\240static const struct of_device_id meson_uart_dt_match[] = {\n" "> +\t/* Legacy bindings, should be removed when no more used */\n" - "> ?\t{ .compatible = \"amlogic,meson-uart\" },\n" + "> \302\240\t{ .compatible = \"amlogic,meson-uart\" },\n" "> +\t/* Stable bindings */\n" "> +\t{ .compatible = \"amlogic,meson6-uart\" },\n" "> +\t{ .compatible = \"amlogic,meson8-uart\" },\n" "> +\t{ .compatible = \"amlogic,meson8b-uart\" },\n" "> +\t{ .compatible = \"amlogic,meson-gx-uart\" },\n" - "> ?\t{ /* sentinel */ },\n" - "> ?};\n" - > ?MODULE_DEVICE_TABLE(of, meson_uart_dt_match); + "> \302\240\t{ /* sentinel */ },\n" + "> \302\240};\n" + "> \302\240MODULE_DEVICE_TABLE(of, meson_uart_dt_match);" -1ac1cdd64628c3abebd3c0fb2f228b575f3d2b4c65ec649e9a909d2a9a16211d +04e79739837748e261a3c9225f84aca15cb4a3b69dae4c19bf69f367409519e6
diff --git a/a/content_digest b/N2/content_digest index eb757f5..f94843b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v4 2/7] tty/serial: meson_uart: update to stable bindings\0" "Date\0Mon, 12 Jun 2017 11:39:04 +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-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -190,4 +190,4 @@ "> ?};\n" > ?MODULE_DEVICE_TABLE(of, meson_uart_dt_match); -1ac1cdd64628c3abebd3c0fb2f228b575f3d2b4c65ec649e9a909d2a9a16211d +f0a446d2dcbeb3b7a9ef6580dda91a39d5575e6ff778f09b4f21571e9aaa073a
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.