Merge tag 'mips_5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ed2e3a51c016da984239fb2dfa4c772100c1a59f..e039e7d542c41a026ac17872ce6fa6008ce87428 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -112,6 +112,7 @@ config MACH_INGENIC
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_ZBOOT
        select DMA_NONCOHERENT
+       select ARCH_HAS_SYNC_DMA_FOR_CPU
        select IRQ_MIPS_CPU
        select PINCTRL
        select GPIOLIB
@@ -427,6 +428,8 @@ config MACH_INGENIC_SOC
        select MIPS_GENERIC
        select MACH_INGENIC
        select SYS_SUPPORTS_ZBOOT_UART16550
+       select CPU_SUPPORTS_CPUFREQ
+       select MIPS_EXTERNAL_TIMER
 
 config LANTIQ
        bool "Lantiq based platforms"
@@ -994,7 +997,6 @@ config CAVIUM_OCTEON_SOC
        select HAVE_PLAT_FW_INIT_CMDLINE
        select HAVE_PLAT_MEMCPY
        select ZONE_DMA32
-       select HOLES_IN_ZONE
        select GPIOLIB
        select USE_OF
        select ARCH_SPARSEMEM_ENABLE
@@ -1231,9 +1233,6 @@ config HAVE_PLAT_MEMCPY
 config ISA_DMA_API
        bool
 
-config HOLES_IN_ZONE
-       bool
-
 config SYS_SUPPORTS_RELOCATABLE
        bool
        help