Commit ff05967a authored by Shawn Guo's avatar Shawn Guo Committed by Grant Likely

serial/imx: add of_alias_get_id() reference back

As of_alias_get_id() gets fixed and ready for use, the patch adds the
of_alias_get_id() reference back to imx serial driver.
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
[grant.likely: changed pr_err() to dev_err(), dropped unnecessary else]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 611cad72
...@@ -1286,17 +1286,20 @@ static int serial_imx_resume(struct platform_device *dev) ...@@ -1286,17 +1286,20 @@ static int serial_imx_resume(struct platform_device *dev)
static int serial_imx_probe_dt(struct imx_port *sport, static int serial_imx_probe_dt(struct imx_port *sport,
struct platform_device *pdev) struct platform_device *pdev)
{ {
static int portnum = 0;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id = const struct of_device_id *of_id =
of_match_device(imx_uart_dt_ids, &pdev->dev); of_match_device(imx_uart_dt_ids, &pdev->dev);
int ret;
if (!np) if (!np)
return -ENODEV; return -ENODEV;
sport->port.line = portnum++; ret = of_alias_get_id(np, "serial");
if (sport->port.line >= UART_NR) if (ret < 0) {
return -EINVAL; dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
return -ENODEV;
}
sport->port.line = ret;
if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) if (of_get_property(np, "fsl,uart-has-rtscts", NULL))
sport->have_rtscts = 1; sport->have_rtscts = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment