Merge tag 'imx-soc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Wed, 6 Nov 2019 15:46:41 +0000 (07:46 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 6 Nov 2019 15:46:42 +0000 (07:46 -0800)
commit0f3dac611060058524c68dadcc0ddaf923c84d1c
tree7a8ea9d6963c7bcff68f854dd1fe750103c398d3
parent3166c3dd4c87d118cbf66f827f4b41765a0b1ba6
parentd7eb28d2740f6d4b485a32b0330a8168eaebb636
Merge tag 'imx-soc-5.5' of git://git./linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC update for 5.5:
 - Add arm64 Kconfig option for the NXP S32 platform.
 - Drop imx_anatop_usb_chrg_detect_disable() function which becomes
   unneeded, since all the necessary charger setup is done by the USB
   PHY driver now.
 - Add serial number support for i.MX6/7 SoCs by reading 64-bit SoC
   unique ID from OCOTP block.
 - Replace i.MX machine specific coherency exit implementation using
   the generic v7_exit_coherency_flush() function.

* tag 'imx-soc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: use generic function to exit coherency
  ARM: imx: Add serial number support for i.MX6/7 SoCs
  ARM: imx: Drop imx_anatop_usb_chrg_detect_disable()
  arm64: Introduce config for S32

Link: https://lore.kernel.org/r/20191105150315.15477-2-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/Kconfig.platforms