Merge intel_pstate driver updates for v4.12.

[karo-tx-linux.git] / drivers / nvmem / imx-ocotp.c

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index 8e7b120696fa91da63a44bc7f4f8422b5d24bc7e..b8ca1e677b016db772027637d1ab9d3c30c28407 100644 (file)
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -73,6 +73,7 @@ static const struct of_device_id imx_ocotp_dt_ids[] = {
        { .compatible = "fsl,imx6q-ocotp",  (void *)128 },
        { .compatible = "fsl,imx6sl-ocotp", (void *)64 },
        { .compatible = "fsl,imx6sx-ocotp", (void *)128 },
+       { .compatible = "fsl,imx6ul-ocotp", (void *)128 },
        { },
 };
 MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);