[PATCH] serial: qcom_geni_serial: use DT aliases according to DT bindings

[PATCH] serial: qcom_geni_serial: use DT aliases according to DT bindings

[Dmitry Baryshkov]

Device tree bindings do not specify "hsuart" aliases, instead all serial
ports should use "serial" alias name as noted by Rob Herring [1].
Make qcom_geni_serial driver use "serial" alias and fallback to "hsuart"
if one is not found.

[1] https://lore.kernel.org/linux-arm-msm/6dd1f5cd-03c7-5945-9fa2-1c2698405110@linaro.org/

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
---
 drivers/tty/serial/qcom_geni_serial.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 23d729ed3bf6..85f1c1f96597 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1354,7 +1354,9 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
 		line = of_alias_get_id(pdev->dev.of_node, "serial");
 	} else {
 		drv = &qcom_geni_uart_driver;
-		line = of_alias_get_id(pdev->dev.of_node, "hsuart");
+		line = of_alias_get_id(pdev->dev.of_node, "serial");
+		if (line == -ENODEV) /* compat with non-standard aliases */
+			line = of_alias_get_id(pdev->dev.of_node, "hsuart");
 	}
 
 	port = get_port_from_line(line, console);
-- 
2.30.2

Re: [PATCH] serial: qcom_geni_serial: use DT aliases according to DT bindings

[Bjorn Andersson]

On Mon 21 Jun 16:15 CDT 2021, Dmitry Baryshkov wrote:

> Device tree bindings do not specify "hsuart" aliases, instead all serial
> ports should use "serial" alias name as noted by Rob Herring [1].
> Make qcom_geni_serial driver use "serial" alias and fallback to "hsuart"
> if one is not found.
> 
> [1] https://lore.kernel.org/linux-arm-msm/6dd1f5cd-03c7-5945-9fa2-1c2698405110@linaro.org/
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Rob Herring <robh+dt@kernel.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Regards,
Bjorn

> ---
>  drivers/tty/serial/qcom_geni_serial.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
> index 23d729ed3bf6..85f1c1f96597 100644
> --- a/drivers/tty/serial/qcom_geni_serial.c
> +++ b/drivers/tty/serial/qcom_geni_serial.c
> @@ -1354,7 +1354,9 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
>  		line = of_alias_get_id(pdev->dev.of_node, "serial");
>  	} else {
>  		drv = &qcom_geni_uart_driver;
> -		line = of_alias_get_id(pdev->dev.of_node, "hsuart");
> +		line = of_alias_get_id(pdev->dev.of_node, "serial");
> +		if (line == -ENODEV) /* compat with non-standard aliases */
> +			line = of_alias_get_id(pdev->dev.of_node, "hsuart");
>  	}
>  
>  	port = get_port_from_line(line, console);
> -- 
> 2.30.2
>