summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2011-11-29 09:43:18 -0700
committerGerrit <chrome-bot@google.com>2011-11-29 11:06:40 -0800
commit4a466bf48a887e3a2eba3e971a3a459b5cbc80be (patch)
treea66a4793cb32ecf712d2db05c0aecd80a2a72f75 /common
parent03fde2c4e5546902e99409e68bf1d63851328f31 (diff)
fdt: uart: fix uart clock freq override; broke x86 uart
CONFIG_SYS_PLLP_BASE_IS_408MHZ is meant only for T30 builds. Don't override to 216MHZ if not Tegra3 && not 408MHZ BUG=chromium-os:23521 TEST=built Seaboard, Waluigi and tested Waluigi. x86 build in queue. Signed-off-by: Tom Warren <twarren@nvidia.com> Change-Id: If9517c473e76b8a1a49c6ff81891946cdb263a44 Reviewed-on: https://gerrit.chromium.org/gerrit/12219 Commit-Ready: Doug Anderson <dianders@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/fdt_decode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/fdt_decode.c b/common/fdt_decode.c
index dab673a02c..96807c47c9 100644
--- a/common/fdt_decode.c
+++ b/common/fdt_decode.c
@@ -306,7 +306,7 @@ int fdt_decode_uart_console(const void *blob, struct fdt_uart *uart,
uart->silent = fdt_decode_get_config_int(blob, "silent_console", 0);
uart->io_mapped = get_int(blob, node, "io-mapped", 0);
uart->compat = fdt_decode_lookup(blob, node);
-#if !defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ)
+#if defined(CONFIG_TEGRA3) && !defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ)
uart->clock_freq = 216000000;
#endif
/* Calculate divisor if required */