random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: tegra: Guard clock code with a Kconfig symbol

Browse Source 
Clock code is not relevant on all Tegra SoC generations, so guard it
with a Kconfig symbol that can be selected by the generations that need
it.

This is in preparation for unifying Tegra186 code with the code used on
older generations.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding 2019-04-15 11:32:18 +02:00 committed by Tom Warren
parent e9c58f2bb8
commit b64e0b9231
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-tegra/Kconfig
View File

@ -12,6 +12,9 @@ config SPL_LIBGENERIC_SUPPORT
config SPL_SERIAL_SUPPORT config SPL_SERIAL_SUPPORT
default y default y
config TEGRA_CLKRST
bool
config TEGRA_IVC config TEGRA_IVC
bool "Tegra IVC protocol" bool "Tegra IVC protocol"
help help
@ -55,6 +58,7 @@ config TEGRA_ARMV7_COMMON
select SPL select SPL
select SPL_BOARD_INIT if SPL select SPL_BOARD_INIT if SPL
select SUPPORT_SPL select SUPPORT_SPL
select TEGRA_CLKRST
select TEGRA_COMMON select TEGRA_COMMON
select TEGRA_GPIO select TEGRA_GPIO
select TEGRA_NO_BPMP select TEGRA_NO_BPMP
@ -100,6 +104,7 @@ config TEGRA124
config TEGRA210 config TEGRA210
bool "Tegra210 family" bool "Tegra210 family"
select TEGRA_ARMV8_COMMON select TEGRA_ARMV8_COMMON
select TEGRA_CLKRST
select TEGRA_GPIO select TEGRA_GPIO
select TEGRA_NO_BPMP select TEGRA_NO_BPMP

2
arch/arm/mach-tegra/Makefile
View File

@ -16,7 +16,7 @@ endif
obj-y += ap.o obj-y += ap.o
obj-y += board.o board2.o obj-y += board.o board2.o
obj-y += cache.o obj-y += cache.o
obj-y += clock.o obj-$(CONFIG_TEGRA_CLKRST) += clock.o
obj-y += pinmux-common.o obj-y += pinmux-common.o
obj-y += powergate.o obj-y += powergate.o
obj-y += xusb-padctl-dummy.o obj-y += xusb-padctl-dummy.o

2
arch/arm/mach-tegra/board.c
View File

@ -9,7 +9,9 @@
#include <ns16550.h> #include <ns16550.h>
#include <spl.h> #include <spl.h>
#include <asm/io.h> #include <asm/io.h>
#if IS_ENABLED(CONFIG_TEGRA_CLKRST)
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#endif
#include <asm/arch/funcmux.h> #include <asm/arch/funcmux.h>
#include <asm/arch/mc.h> #include <asm/arch/mc.h>
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>

12
arch/arm/mach-tegra/board2.c
View File

@ -22,7 +22,9 @@
#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/gpu.h>
#include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/usb.h>
#include <asm/arch-tegra/xusb-padctl.h> #include <asm/arch-tegra/xusb-padctl.h>
#if IS_ENABLED(CONFIG_TEGRA_CLKRST)
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#endif
#include <asm/arch/funcmux.h> #include <asm/arch/funcmux.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
@ -109,8 +111,10 @@ int board_init(void)
__maybe_unused int board_id; __maybe_unused int board_id;
/* Do clocks and UART first so that printf() works */ /* Do clocks and UART first so that printf() works */
#if IS_ENABLED(CONFIG_TEGRA_CLKRST)
clock_init(); clock_init();
clock_verify(); clock_verify();
#endif
tegra_gpu_config(); tegra_gpu_config();
@ -181,8 +185,10 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init")));
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if IS_ENABLED(CONFIG_TEGRA_CLKRST)
if (!clock_early_init_done()) if (!clock_early_init_done())
clock_early_init(); clock_early_init();
#endif
#if defined(CONFIG_TEGRA_DISCONNECT_UDC_ON_BOOT) #if defined(CONFIG_TEGRA_DISCONNECT_UDC_ON_BOOT)
#define USBCMD_FS2 (1 << 15) #define USBCMD_FS2 (1 << 15)
@ -193,10 +199,12 @@ int board_early_init_f(void)
#endif #endif
/* Do any special system timer/TSC setup */ /* Do any special system timer/TSC setup */
#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE) #if IS_ENABLED(CONFIG_TEGRA_CLKRST)
# if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
if (!tegra_cpu_is_non_secure()) if (!tegra_cpu_is_non_secure())
#endif # endif
arch_timer_init(); arch_timer_init();
#endif
pinmux_init(); pinmux_init();
board_init_uart_f(); board_init_uart_f();