diff options
author | mmel <mmel@FreeBSD.org> | 2017-04-16 07:41:30 +0000 |
---|---|---|
committer | mmel <mmel@FreeBSD.org> | 2017-04-16 07:41:30 +0000 |
commit | 92ef06e740d1067387434c033c577d17665c0fd5 (patch) | |
tree | 2787d916d17f4190366c493094397db2a4684eed /sys/arm | |
parent | 2d4b5ed3310ee2a108a26c0817ed03a5aeb0874d (diff) | |
download | FreeBSD-src-92ef06e740d1067387434c033c577d17665c0fd5.zip FreeBSD-src-92ef06e740d1067387434c033c577d17665c0fd5.tar.gz |
MFC r306442,r306444,r306445,r306550:
r306442:
TEGRA: Add support for MULTIDELAY option.
r306444:
TEGRA: Don't include files already included by system or arch configs.
r306445:
TEGRA: Return back kern_clocksource.c into tegra config file. It was
removed in r306444 by mistake.
r306550:
TEGRA: Extend timeout for PLLs lock to 5 ms. Real lock time for PLLA has
been very near to old limit.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/conf/TEGRA124 | 1 | ||||
-rw-r--r-- | sys/arm/nvidia/tegra124/files.tegra124 | 1 | ||||
-rw-r--r-- | sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 2 | ||||
-rw-r--r-- | sys/arm/nvidia/tegra124/tegra124_machdep.c | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index 34e8409..d5ebe86 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -26,6 +26,7 @@ ident TEGRA124 options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC options PLATFORM_SMP +options MULTIDELAY options SMP # Enable multiple cores options LINUX_BOOT_ABI diff --git a/sys/arm/nvidia/tegra124/files.tegra124 b/sys/arm/nvidia/tegra124/files.tegra124 index d4d38f7..7d9fcba 100644 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -4,7 +4,6 @@ # Standard ARM support. # kern/kern_clocksource.c standard -dev/ofw/ofw_cpu.c optional fdt # # Standard tegra124 devices and support. diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c index 2c5c3a2..1d89e10 100644 --- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c +++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c @@ -86,7 +86,7 @@ enum pll_type { #define PLLRE_IDDQ_BIT 16 #define PLLSS_IDDQ_BIT 19 -#define PLL_LOCK_TIMEOUT 1000 +#define PLL_LOCK_TIMEOUT 5000 /* Post divider <-> register value mapping. */ struct pdiv_table { diff --git a/sys/arm/nvidia/tegra124/tegra124_machdep.c b/sys/arm/nvidia/tegra124/tegra124_machdep.c index d1e3889..01008d7 100644 --- a/sys/arm/nvidia/tegra124/tegra124_machdep.c +++ b/sys/arm/nvidia/tegra124/tegra124_machdep.c @@ -151,4 +151,4 @@ static platform_method_t tegra124_methods[] = { PLATFORMMETHOD_END, }; -FDT_PLATFORM_DEF(tegra124, "Nvidia Jetson-TK1", 0, "nvidia,jetson-tk1", 0); +FDT_PLATFORM_DEF(tegra124, "Nvidia Jetson-TK1", 0, "nvidia,jetson-tk1", 120); |