diff options
Diffstat (limited to 'drivers/tty/serial/imx.c')
-rw-r--r-- | drivers/tty/serial/imx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index e309e8b0aaba..5952b25c288e 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
@@ -207,7 +207,7 @@ struct imx_port { | |||
207 | unsigned short trcv_delay; /* transceiver delay */ | 207 | unsigned short trcv_delay; /* transceiver delay */ |
208 | struct clk *clk_ipg; | 208 | struct clk *clk_ipg; |
209 | struct clk *clk_per; | 209 | struct clk *clk_per; |
210 | struct imx_uart_data *devdata; | 210 | const struct imx_uart_data *devdata; |
211 | }; | 211 | }; |
212 | 212 | ||
213 | struct imx_port_ucrs { | 213 | struct imx_port_ucrs { |
@@ -1505,18 +1505,21 @@ static int serial_imx_probe(struct platform_device *pdev) | |||
1505 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | 1505 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); |
1506 | if (IS_ERR(pinctrl)) { | 1506 | if (IS_ERR(pinctrl)) { |
1507 | ret = PTR_ERR(pinctrl); | 1507 | ret = PTR_ERR(pinctrl); |
1508 | dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret); | ||
1508 | goto unmap; | 1509 | goto unmap; |
1509 | } | 1510 | } |
1510 | 1511 | ||
1511 | sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); | 1512 | sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); |
1512 | if (IS_ERR(sport->clk_ipg)) { | 1513 | if (IS_ERR(sport->clk_ipg)) { |
1513 | ret = PTR_ERR(sport->clk_ipg); | 1514 | ret = PTR_ERR(sport->clk_ipg); |
1515 | dev_err(&pdev->dev, "failed to get ipg clk: %d\n", ret); | ||
1514 | goto unmap; | 1516 | goto unmap; |
1515 | } | 1517 | } |
1516 | 1518 | ||
1517 | sport->clk_per = devm_clk_get(&pdev->dev, "per"); | 1519 | sport->clk_per = devm_clk_get(&pdev->dev, "per"); |
1518 | if (IS_ERR(sport->clk_per)) { | 1520 | if (IS_ERR(sport->clk_per)) { |
1519 | ret = PTR_ERR(sport->clk_per); | 1521 | ret = PTR_ERR(sport->clk_per); |
1522 | dev_err(&pdev->dev, "failed to get per clk: %d\n", ret); | ||
1520 | goto unmap; | 1523 | goto unmap; |
1521 | } | 1524 | } |
1522 | 1525 | ||