summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:47 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:47 +0100
commit6b00efcb0fa1284741ef1d92a990409519f8fb28 (patch)
tree0831866e0c50c0c5ca0917b1c1c660e43e2334d0 /drivers/pinctrl
parent9bc62894a844650ba0a673b5b4ca96f4989d98d3 (diff)
parent024912ba32bccb931e994e8929839751fce9097e (diff)
downloadbarebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.gz
barebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/imx-iomux-v3.c2
1 files changed, 2 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 */
}
};