aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/Kconfig.platforms
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-11-06 07:46:41 -0800
committerOlof Johansson <olof@lixom.net>2019-11-06 07:46:42 -0800
commit0f3dac611060058524c68dadcc0ddaf923c84d1c (patch)
tree7a8ea9d6963c7bcff68f854dd1fe750103c398d3 /arch/arm64/Kconfig.platforms
parent3166c3dd4c87d118cbf66f827f4b41765a0b1ba6 (diff)
parentd7eb28d2740f6d4b485a32b0330a8168eaebb636 (diff)
downloadkernel-0f3dac611060058524c68dadcc0ddaf923c84d1c.tar.gz
Merge tag 'imx-soc-5.5' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r--arch/arm64/Kconfig.platforms5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 90d3c04ebff0..b2b504ea6fd6 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -214,6 +214,11 @@ config ARCH_ROCKCHIP
This enables support for the ARMv8 based Rockchip chipsets,
like the RK3368.
+config ARCH_S32
+ bool "NXP S32 SoC Family"
+ help
+ This enables support for the NXP S32 family of processors.
+
config ARCH_SEATTLE
bool "AMD Seattle SoC Family"
help