Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0531b9b authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[PATCH] cpm_uart: Fix baseaddress for SMC 1 and 2 



Base addess register for SMC 1 and 2 are never initialized.  This means
that they will not work unless a bootloader already configured them.

The DPRAM already have space reserved, this patch just makes sure the base
addess register is updated correctly on initialization.

Signed-off-by: default avatarRune Torgersen <runet@innovsys.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 638861d5

drivers/serial/cpm_uart/cpm_uart_cpm2.c

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ int cpm_uart_init_portdesc(void) 
	cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];

	cpm_uart_ports[UART_SMC1].smcup =

	    (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];

	*(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;

	cpm_uart_ports[UART_SMC1].port.mapbase =

	    (unsigned long)&cpm2_immr->im_smc[0];

	cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
@@ -278,6 +279,7 @@ int cpm_uart_init_portdesc(void) 
	cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];

	cpm_uart_ports[UART_SMC2].smcup =

	    (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];

	*(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;

	cpm_uart_ports[UART_SMC2].port.mapbase =

	    (unsigned long)&cpm2_immr->im_smc[1];

	cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);