Michael Williamson <[email protected]> writes:
> This patch adds machine checks in the serial console init routines
> for the DA8XX EVM boards. This is needed because there are other
> DA8XX based machines that use a different UART/tty as the console
> and may be included in a common kernel build.
>
> Signed-off-by: Michael Williamson <[email protected]>
Applied, queueing for 2.6.37 in davinci-next branch.
Thanks,
Kevin
> ---
> arch/arm/mach-davinci/board-da830-evm.c | 3 +++
> arch/arm/mach-davinci/board-da850-evm.c | 3 +++
> 2 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-da830-evm.c
> b/arch/arm/mach-davinci/board-da830-evm.c
> index 292e8b7..e51a80f 100644
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@ -586,6 +586,9 @@ static __init void da830_evm_init(void)
> #ifdef CONFIG_SERIAL_8250_CONSOLE
> static int __init da830_evm_console_init(void)
> {
> + if (!machine_is_davinci_da830_evm())
> + return 0;
> +
> return add_preferred_console("ttyS", 2, "115200");
> }
> console_initcall(da830_evm_console_init);
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c
> b/arch/arm/mach-davinci/board-da850-evm.c
> index 190ebd3..d491b5f 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -847,6 +847,9 @@ static __init void da850_evm_init(void)
> #ifdef CONFIG_SERIAL_8250_CONSOLE
> static int __init da850_evm_console_init(void)
> {
> + if (!machine_is_davinci_da850_evm())
> + return 0;
> +
> return add_preferred_console("ttyS", 2, "115200");
> }
> console_initcall(da850_evm_console_init);
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
