Merge branch 'imx-nvmem' into thermal-soc