]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dra7xx: Always enable UART1 and UART3 in early_padconf
authorTom Rini <trini@konsulko.com>
Wed, 7 Mar 2018 00:02:26 +0000 (19:02 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 16 Mar 2018 14:26:14 +0000 (10:26 -0400)
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 <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
board/ti/dra7xx/mux_data.h

index b5dcaa584a2494f7d074d9f0cd547a9e50cb6eed..32c9ecacce2aa1647701f0e74dc70492005d4278 100644 (file)
@@ -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 */
 };