omap_uart: rename OMAP3EVM_UARTx to OMAP_UARTx
use a more generic UART selection on OMAP so it can be extended to other OMAPs Signed-off-by: Vicente Bergas <vicencb@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
c9f6ceb59e
commit
dfd768b3ac
|
@ -62,9 +62,9 @@
|
||||||
*/
|
*/
|
||||||
static int omap3evm_init_console(void)
|
static int omap3evm_init_console(void)
|
||||||
{
|
{
|
||||||
if (IS_ENABLED(CONFIG_OMAP3EVM_UART1))
|
if (IS_ENABLED(CONFIG_OMAP_UART1))
|
||||||
omap3_add_uart1();
|
omap3_add_uart1();
|
||||||
if (IS_ENABLED(CONFIG_OMAP3EVM_UART3))
|
if (IS_ENABLED(CONFIG_OMAP_UART3))
|
||||||
omap3_add_uart3();
|
omap3_add_uart3();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -122,12 +122,12 @@ static void mux_config(void)
|
||||||
/*
|
/*
|
||||||
* Serial Interface
|
* Serial Interface
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_OMAP3EVM_UART1)
|
#if defined(CONFIG_OMAP_UART1)
|
||||||
MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0));
|
MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0));
|
||||||
MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M0));
|
MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M0));
|
||||||
MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M0));
|
MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M0));
|
||||||
MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0));
|
MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0));
|
||||||
#elif defined(CONFIG_OMAP3EVM_UART3)
|
#elif defined(CONFIG_OMAP_UART3)
|
||||||
MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0));
|
MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0));
|
||||||
MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0));
|
MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0));
|
||||||
MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0));
|
MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0));
|
||||||
|
|
|
@ -187,20 +187,21 @@ config MACH_PCM051
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
if MACH_OMAP3EVM
|
if ARCH_OMAP
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Select UART"
|
prompt "Select UART"
|
||||||
|
default OMAP_UART3
|
||||||
|
|
||||||
config OMAP3EVM_UART1
|
config OMAP_UART1
|
||||||
bool "Use UART1"
|
bool "Use UART1"
|
||||||
depends on MACH_OMAP3EVM
|
depends on ARCH_OMAP
|
||||||
help
|
help
|
||||||
Say Y here if you would like to use UART1 as console.
|
Say Y here if you would like to use UART1 as console.
|
||||||
|
|
||||||
config OMAP3EVM_UART3
|
config OMAP_UART3
|
||||||
bool "Use UART3"
|
bool "Use UART3"
|
||||||
depends on MACH_OMAP3EVM
|
depends on ARCH_OMAP
|
||||||
help
|
help
|
||||||
Say Y here if you would like to use UART3 as console.
|
Say Y here if you would like to use UART3 as console.
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#ifdef CONFIG_ARCH_OMAP3
|
#ifdef CONFIG_ARCH_OMAP3
|
||||||
#include <mach/omap3-silicon.h>
|
#include <mach/omap3-silicon.h>
|
||||||
|
|
||||||
#ifdef CONFIG_OMAP3EVM_UART1
|
#ifdef CONFIG_OMAP_UART1
|
||||||
#define UART_BASE OMAP3_UART1_BASE
|
#define UART_BASE OMAP3_UART1_BASE
|
||||||
#else
|
#else
|
||||||
#define UART_BASE OMAP3_UART3_BASE
|
#define UART_BASE OMAP3_UART3_BASE
|
||||||
|
@ -32,8 +32,12 @@
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_OMAP4
|
#ifdef CONFIG_ARCH_OMAP4
|
||||||
#include <mach/omap4-silicon.h>
|
#include <mach/omap4-silicon.h>
|
||||||
|
#ifdef CONFIG_OMAP_UART1
|
||||||
|
#define UART_BASE OMAP44XX_UART1_BASE
|
||||||
|
#else
|
||||||
#define UART_BASE OMAP44XX_UART3_BASE
|
#define UART_BASE OMAP44XX_UART3_BASE
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_AM33XX
|
#ifdef CONFIG_ARCH_AM33XX
|
||||||
#include <mach/am33xx-silicon.h>
|
#include <mach/am33xx-silicon.h>
|
||||||
|
|
Loading…
Reference in New Issue