--- zzzz-none-000/linux-4.4.60/arch/arm/mach-qcom/Kconfig	2017-04-08 07:53:53.000000000 +0000
+++ scorpion-7490-727/linux-4.4.60/arch/arm/mach-qcom/Kconfig	2021-02-04 17:41:59.000000000 +0000
@@ -4,7 +4,9 @@
 	select ARM_GIC
 	select ARM_AMBA
 	select PINCTRL
+	select ARCH_WANT_KMAP_ATOMIC_FLUSH
 	select QCOM_SCM if SMP
+	select PCI_DOMAINS if PCI
 	help
 	  Support for Qualcomm's devicetree based systems.
 
@@ -22,4 +24,42 @@
 	bool "Enable support for MSM8974"
 	select HAVE_ARM_ARCH_TIMER
 
+config ARCH_IPQ807x
+	bool "Enable Support for IPQ807x"
+	select PINCTRL_IPQ807x
+	select COMMON_CLK_QCOM
+	select IPQ_APSS_807x
+	select IPQ_GCC_807x
+# AVM: Set ARCH used in linux 3.14
+	select ARCH_IPQ40XX
+	help
+	  This enables support for the IPQ807x chipset. If you dont
+	  know what do here, say N
+
+config ARCH_IPQ6018
+	bool "Enable Support for IPQ6018"
+	select PINCTRL_IPQ6018
+	select COMMON_CLK_QCOM
+	select IPQ_APSS_6018
+	select IPQ_GCC_6018
+	help
+	  This enables support for the IPQ6018 chipset. If you dont
+	  know what do here, say N
+
+config ARCH_IPQ40XX
+	bool "Enable linux 3.14 compatible ARCH definition"
+	depends on ARCH_IPQ807x
+	help
+	  This is automatically enabled by ARCH_IPQ807x to be
+	  compatible with linux 3.12.
+
+config IPQ_MEM_PROFILE
+	int "Select Memory Profile"
+	range 0 1024
+	default 0
+	---help---
+	This option select memory profile to be used,which defines
+	the reserved memory configuration used in device tree.
+
+	If unsure, say 0
 endif