From: Tom Rini Date: Wed, 7 Mar 2018 00:02:26 +0000 (-0500) Subject: dra7xx: Always enable UART1 and UART3 in early_padconf X-Git-Tag: v2018.05-rc1~81 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7dc7a38c79d2f3fccda845ce7ec4a623e1d26335;p=u-boot dra7xx: Always enable UART1 and UART3 in early_padconf It is safe to always setup the pinmux for UART1 and UART3 to be used in early_padconf and then if these pins are needed later on, they will be re-muxed. This allows us to drop the usage of CONFIG_CONS_INDEX here. Cc: Lokesh Vutla Signed-off-by: Tom Rini Reviewed-by: Lokesh Vutla --- diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index b5dcaa584a..32c9ecacce 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -372,13 +372,10 @@ const struct pad_conf_entry dra71x_core_padconf_array[] = { }; const struct pad_conf_entry early_padconf[] = { -#if (CONFIG_CONS_INDEX == 1) {UART1_RXD, (PIN_INPUT_SLEW | M0)}, /* UART1_RXD */ {UART1_TXD, (PIN_INPUT_SLEW | M0)}, /* UART1_TXD */ -#elif (CONFIG_CONS_INDEX == 3) {UART3_RXD, (PIN_INPUT_SLEW | M0)}, /* UART3_RXD */ {UART3_TXD, (PIN_INPUT_SLEW | M0)}, /* UART3_TXD */ -#endif {I2C1_SDA, (PIN_INPUT | M0)}, /* I2C1_SDA */ {I2C1_SCL, (PIN_INPUT | M0)}, /* I2C1_SCL */ };