Skip to content

Commit

Permalink
serial/imx: add of_alias_get_id() reference back
Browse files Browse the repository at this point in the history
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: Shawn Guo <shawn.guo@linaro.org>
[grant.likely: changed pr_err() to dev_err(), dropped unnecessary else]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Shawn Guo authored and Grant Likely committed Sep 22, 2011
1 parent 611cad7 commit ff05967
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/tty/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1286,17 +1286,20 @@ static int serial_imx_resume(struct platform_device *dev)
static int serial_imx_probe_dt(struct imx_port *sport,
struct platform_device *pdev)
{
static int portnum = 0;
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
of_match_device(imx_uart_dt_ids, &pdev->dev);
int ret;

if (!np)
return -ENODEV;

sport->port.line = portnum++;
if (sport->port.line >= UART_NR)
return -EINVAL;
ret = of_alias_get_id(np, "serial");
if (ret < 0) {
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))
sport->have_rtscts = 1;
Expand Down

0 comments on commit ff05967

Please sign in to comment.