diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
| commit | 30139163b75970fcd58df6b6b987883e36571046 (patch) | |
| tree | 00bd354cefa617f8474cc73994b1a72c11e770a0 /drivers/serial | |
| parent | bb1a6a2fd3cc41be6db1a1362f311456019317b1 (diff) | |
| parent | 19df384cec181be4407f82377ffbb3059b1ed748 (diff) | |
| download | barebox-30139163b75970fcd58df6b6b987883e36571046.tar.gz barebox-30139163b75970fcd58df6b6b987883e36571046.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_imx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 2b1e5e07ab..e8c3836a66 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -228,6 +228,7 @@ static int imx_serial_probe(struct device_d *dev) ret = PTR_ERR(priv->clk); goto err_free; } + clk_enable(priv->clk); iores = dev_request_mem_resource(dev, 0); if (IS_ERR(iores)) @@ -289,6 +290,9 @@ static __maybe_unused struct of_device_id imx_serial_dt_ids[] = { }, { .compatible = "fsl,imx6ul-uart", .data = &imx21_data, + }, { + .compatible = "fsl,imx7d-uart", + .data = &imx21_data, }, { /* sentinel */ } |