diff options
| author | Tom Warren <twarren@nvidia.com> | 2015-03-04 16:36:00 -0700 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2015-07-28 10:30:20 -0700 |
| commit | 7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e (patch) | |
| tree | 677f1285e60b87ed648e5186f5235999c87aba30 /arch/arm/mach-tegra/board.c | |
| parent | 6c43f6c8d920caa1db01f5d0571a4d9ba720be15 (diff) | |
| download | talos-obmc-uboot-7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e.tar.gz talos-obmc-uboot-7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e.zip | |
ARM: Tegra210: Add support to common Tegra source/config files
Derived from Tegra124, modified as appropriate during T210
board bringup. Cleaned up debug statements to conserve
string space, too. This also adds misc 64-bit changes
from Thierry Reding/Stephen Warren.
Signed-off-by: Tom Warren <twarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board.c')
| -rw-r--r-- | arch/arm/mach-tegra/board.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 036bf5e1e4..40de72dc57 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010-2014 + * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -143,12 +143,18 @@ static int uart_configs[] = { -1, FUNCMUX_UART4_GMI, /* UARTD */ -1, -#else /* Tegra124 */ +#elif defined(CONFIG_TEGRA124) FUNCMUX_UART1_KBC, /* UARTA */ -1, -1, FUNCMUX_UART4_GPIO, /* UARTD */ -1, +#else /* Tegra210 */ + FUNCMUX_UART1_UART1, /* UARTA */ + -1, + -1, + FUNCMUX_UART4_UART4, /* UARTD */ + -1, #endif }; |
