Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / loongson / Kconfig

diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index 1b91fc6a921bca06f953ec9522c17fbd2f621ff7..156de85b82cd552eb9b422a1ed613fa70ab9a0e6 100644 (file)
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -86,6 +86,7 @@ config LOONGSON_MACH3X
        select LOONGSON_MC146818
        select ZONE_DMA32
        select LEFI_FIRMWARE_INTERFACE
+       select PHYS48_TO_HT40
        help
                Generic Loongson 3 family machines utilize the 3A/3B revision
                of Loongson processor and RS780/SBX00 chipset.
@@ -107,6 +108,18 @@ config CS5536_MFGPT
 
          If unsure, say Yes.
 
+config RS780_HPET
+       bool "RS780/SBX00 HPET Timer"
+       depends on LOONGSON_MACH3X
+       select MIPS_EXTERNAL_TIMER
+       help
+         This option enables the hpet timer of AMD RS780/SBX00.
+
+         If you want to enable the Loongson3 CPUFreq Driver, Please enable
+         this option at first, otherwise, You will get wrong system time.
+
+         If unsure, say Yes.
+
 config LOONGSON_SUSPEND
        bool
        default y
@@ -131,6 +144,10 @@ config SWIOTLB
        select NEED_SG_DMA_LENGTH
        select NEED_DMA_MAP_STATE
 
+config PHYS48_TO_HT40
+       bool
+       default y if CPU_LOONGSON3
+
 config LOONGSON_MC146818
        bool
        default n