Merge tag 'imx-soc-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 May 2020 22:03:12 +0000 (00:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 May 2020 22:03:12 +0000 (00:03 +0200)
commit66ee9359b0d43b1ba3c3548c9e20789ab9da3365
tree39e29f307207a8f143a40a1369e51ca0ec6f609c
parent97a2f40e3801905c7221df8ce2f2231632ce8ce4
parent52102a3ba6a617449f4b057880d73be93310a7c7
Merge tag 'imx-soc-5.8' of git://git./linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC changes for 5.8:

- Add soc device support for Vybrid/VF platform.
- Move the i.MX soc device registration code from mach-imx to
  drivers/soc/imx for possible future consolidation with i.MX8 code.
- A small fixup to make pcm970_sja1000_platform_data static.

* tag 'imx-soc-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: move cpu code to drivers/soc/imx
  ARM: imx: move cpu definitions into a header
  ARM: imx: use device_initcall for imx_soc_device_init
  ARM: imx: pcm037: make pcm970_sja1000_platform_data static
  ARM: vf610: report soc info via soc device

Link: https://lore.kernel.org/r/20200523032516.11016-2-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>