mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.
Previously, if udbg was using the CPM uart, and the normal CPM uart driver was enabled, but the console was directed elsewhere, udbg would not be stopped prior to initialization. This resulted in udbg hanging forever waiting for the CPM to process a descriptor. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
bd86ef3784
commit
4d8107f474
1 changed files with 4 additions and 4 deletions
|
@ -1106,6 +1106,10 @@ static int cpm_uart_init_port(struct device_node *np,
|
|||
for (i = 0; i < NUM_GPIOS; i++)
|
||||
pinfo->gpios[i] = of_get_gpio(np, i);
|
||||
|
||||
#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
|
||||
udbg_putc = NULL;
|
||||
#endif
|
||||
|
||||
return cpm_uart_request_port(&pinfo->port);
|
||||
|
||||
out_pram:
|
||||
|
@ -1255,10 +1259,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
|
|||
baud = 9600;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
|
||||
udbg_putc = NULL;
|
||||
#endif
|
||||
|
||||
if (IS_SMC(pinfo)) {
|
||||
out_be16(&pinfo->smcup->smc_brkcr, 0);
|
||||
cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX);
|
||||
|
|
Loading…
Reference in a new issue