ARM: tegra: include timer as default option

Enable TIMER and TEGRA_TIMER for TEGRA_ARMV7_COMMON and TEGRA210.
Additionally enable SPL_TIMER if build as SPL part and drop
deprecated configs from common header.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom <twarren@nvidia.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5e112e6a03d64eb97532360cbb995ad7d009d1ba..bd7fffcce0ba5362c07f5c686461f8ef5f85e245 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1286,6 +1286,7 @@ config ARCH_TEGRA
        select GPIO_EXTRA_HEADER
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
+       imply SPL_TIMER if SPL
 
 config ARCH_VEXPRESS64
        bool "Support ARMv8 Arm Ltd. VExpress based boards and models"

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 1b575cc0f456530068142c1d7434f357cdd635f5..4fc79ebadbfa796b21c58a04fb4fbdb6fed627fa 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -73,6 +73,7 @@ config TEGRA_ARMV7_COMMON
        select SPL_BOARD_INIT if SPL
        select SPL_SKIP_LOWLEVEL_INIT_ONLY if SPL
        select SUPPORT_SPL
+       select TIMER
        select TEGRA_CLKRST
        select TEGRA_COMMON
        select TEGRA_GPIO
@@ -81,6 +82,7 @@ config TEGRA_ARMV7_COMMON
        select TEGRA_NO_BPMP
        select TEGRA_PINCTRL
        select TEGRA_PMC
+       select TEGRA_TIMER
 
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
@@ -125,6 +127,7 @@ config TEGRA124
 config TEGRA210
        bool "Tegra210 family"
        select GICV2
+       select TIMER
        select TEGRA_ARMV8_COMMON
        select TEGRA_CLKRST
        select TEGRA_GPIO
@@ -134,6 +137,7 @@ config TEGRA210
        select TEGRA_PINCTRL
        select TEGRA_PMC
        select TEGRA_PMC_SECURE
+       select TEGRA_TIMER
 
 config TEGRA186
        bool "Tegra186 family"

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index bde7ffce008fb708a972adb4e51575b98503e7c8..c558679d044fbe22afbf517ab0f0876016890fc8 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -15,12 +15,6 @@
 
 #include <asm/arch/tegra.h>            /* get chip and board defs */
 
-/* Use the Tegra US timer on ARMv7, but the architected timer on ARMv8. */
-#ifndef CONFIG_ARM64
-#define CFG_SYS_TIMER_RATE             1000000
-#define CFG_SYS_TIMER_COUNTER  NV_PA_TMRUS_BASE
-#endif
-
 /* Environment */
 
 /*