diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2011-06-16 13:28:06 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:29 -0700 |
| commit | a3df2b906de83334ff43356d749444a8282c9376 (patch) | |
| tree | 4d55cb5971bb7e67f47520d95a2ea663f62d02e5 /board | |
| parent | fcb9de923b48decb424be5bf0d34a2542aa5f494 (diff) | |
Make sure gpio config mismatch is properly reported.
BUG=chromium-os:834
TEST=none
Change-Id: I11e5ad44748beaa7c7ba6fb213f5a98cc1ad3962
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/2775
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/nvidia/common/uart-spi-fix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/nvidia/common/uart-spi-fix.c b/board/nvidia/common/uart-spi-fix.c index e0fbcd0a36f..803008ca187 100644 --- a/board/nvidia/common/uart-spi-fix.c +++ b/board/nvidia/common/uart-spi-fix.c @@ -47,14 +47,14 @@ static enum spi_uart_switch switch_pos; /* Current switch position */ static void get_config(const void *blob, struct fdt_spi_uart *config) { + config->gpio = -1; /* just in case the config does not exist */ + #ifdef CONFIG_OF_CONTROL fdt_decode_get_spi_switch(blob, config); #elif defined CONFIG_SPI_CORRUPTS_UART config->gpio = UART_DISABLE_GPIO; config->regs = (NS16550_t)CONFIG_SPI_CORRUPTS_UART; config->port = CONFIG_SPI_CORRUPTS_UART_NR; -#else - config->gpio = -1; #endif } |