From: Neil Armstrong <narmstrong@baylibre.com>
To: Loys Ollivier <lollivier@baylibre.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Kevin Hilman <khilman@baylibre.com>
Cc: linux-amlogic@lists.infradead.org, linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tty: serial: meson: if no alias specified use an available id
Date: Tue, 15 Jan 2019 10:35:25 +0100 [thread overview]
Message-ID: <0186aad7-24fa-a6bd-ac52-845325d74b6f@baylibre.com> (raw)
In-Reply-To: <1547484866-3600-1-git-send-email-lollivier@baylibre.com>
On 14/01/2019 17:54, Loys Ollivier wrote:
> At probe, the uart driver tries to get an id from a device tree alias.
> When no alias was specified, the driver would return an error and probing
> would fail.
>
> Providing an alias for registering a serial device should not be mandatory.
> If the device tree does not specify an alias, provide an id from a reserved
> range so that the probing can continue.
>
> Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
> ---
> drivers/tty/serial/meson_uart.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
> index 8a842591b37c..fbc5bc022a39 100644
> --- a/drivers/tty/serial/meson_uart.c
> +++ b/drivers/tty/serial/meson_uart.c
> @@ -72,7 +72,8 @@
> #define AML_UART_BAUD_USE BIT(23)
> #define AML_UART_BAUD_XTAL BIT(24)
>
> -#define AML_UART_PORT_NUM 6
> +#define AML_UART_PORT_NUM 12
> +#define AML_UART_PORT_OFFSET 6
> #define AML_UART_DEV_NAME "ttyAML"
>
>
> @@ -654,10 +655,20 @@ static int meson_uart_probe(struct platform_device *pdev)
> struct resource *res_mem, *res_irq;
> struct uart_port *port;
> int ret = 0;
> + int id = -1;
>
> if (pdev->dev.of_node)
> pdev->id = of_alias_get_id(pdev->dev.of_node, "serial");
>
> + if (pdev->id < 0) {
> + for (id = AML_UART_PORT_OFFSET; id < AML_UART_PORT_NUM; id++) {
> + if (!meson_ports[id]) {
> + pdev->id = id;
> + break;
> + }
> + }
> + }
> +
> if (pdev->id < 0 || pdev->id >= AML_UART_PORT_NUM)
> return -EINVAL;
>
>
This is welcome !
You could also add:
Suggested-by: Rob Herring <robh@kernel.org>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
prev parent reply other threads:[~2019-01-15 9:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 16:54 [PATCH] tty: serial: meson: if no alias specified use an available id Loys Ollivier
2019-01-15 9:35 ` Neil Armstrong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0186aad7-24fa-a6bd-ac52-845325d74b6f@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lollivier@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).