diff options
author | Olof Johansson <olof@lixom.net> | 2019-06-25 05:43:40 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-06-25 05:43:40 -0700 |
commit | 21000823f5571ce65bb150af74b33c24f8c6c10f (patch) | |
tree | 29b2d71aa0a625c3e3cbef727b997592f9a7bb4e /drivers/soc/imx/Makefile | |
parent | 0aa447e5ce1463243ae83071de7b732d8075944e (diff) | |
parent | db10496c0064ba3355936de801cd3ba0b6711bd1 (diff) |
Merge tag 'imx-drivers-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers
i.MX driver changes for 5.3:
- Add i.MX SCU based SoC bus driver for i.MX8QXP SoC support, which
talks to SCU firmware for getting SoC ID and revision.
- Update soc-imx8 bus driver to read imx8mm soc revision from anatop.
- Add i.MX8MN SoC bus support into soc-imx8 driver.
- Various small improvements on soc-imx8 bus driver.
* tag 'imx-drivers-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
soc: imx: Add i.MX8MN SoC driver support
soc: imx8: Use existing of_root directly
soc: imx8: Fix potential kernel dump in error path
soc: imx: soc-imx8: Correct return value of error handle
soc: imx: soc-imx8: Avoid unnecessary of_node_put() in error handling
soc: imx: Add SCU SoC info driver support
soc: imx: Read imx8mm soc revision from anatop
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/imx/Makefile')
-rw-r--r-- | drivers/soc/imx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index caa8653600f2..cf9ca42ff739 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_ARCH_MXC) += soc-imx8.o +obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o |