diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:47 +0100 |
| commit | 6b00efcb0fa1284741ef1d92a990409519f8fb28 (patch) | |
| tree | 0831866e0c50c0c5ca0917b1c1c660e43e2334d0 /drivers | |
| parent | 9bc62894a844650ba0a673b5b4ca96f4989d98d3 (diff) | |
| parent | 024912ba32bccb931e994e8929839751fce9097e (diff) | |
| download | barebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.gz barebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v3.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_imx.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index 92fac18ef6..4b3f033894 100644 --- a/drivers/pinctrl/imx-iomux-v3.c +++ b/drivers/pinctrl/imx-iomux-v3.c @@ -207,6 +207,8 @@ static __maybe_unused struct of_device_id imx_iomux_v3_dt_ids[] = { }, { .compatible = "fsl,imx6sx-iomuxc", }, { + .compatible = "fsl,imx6ul-iomuxc", + }, { /* sentinel */ } }; diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index f140310fdc..2b1e5e07ab 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -287,6 +287,9 @@ static __maybe_unused struct of_device_id imx_serial_dt_ids[] = { .compatible = "fsl,imx21-uart", .data = &imx21_data, }, { + .compatible = "fsl,imx6ul-uart", + .data = &imx21_data, + }, { /* sentinel */ } }; |