The patch titled
cpm_uart: Fix baseaddress for SMC 1 and 2
has been added to the -mm tree. Its filename is
cpm_uart-fix-baseaddress-for-smc-1-and-2.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
ppc32-remove-board-support-for-adir.patch
ppc32-remove-board-support-for-ash.patch
ppc32-remove-board-support-for-beech.patch
ppc32-remove-defconfig-for-cedar.patch
ppc32-remove-board-support-for-k2.patch
ppc32-remove-board-support-for-mcpn765.patch
ppc32-remove-board-support-for-menf1.patch
ppc32-remove-board-support-for-oak.patch
ppc32-remove-board-support-for-rainier.patch
ppc32-remove-board-support-for-redwood.patch
ppc32-remove-board-support-for-sm850.patch
ppc32-remove-board-support-for-spd823ts.patch
ppc32-remove-board-support-for-pcore.patch
ppc32-added-support-for-the-book-e-style-watchdog-timer.patch
ppc32-add-ppc_sys-descriptions-for-powerquicc-ii-devices.patch
cpm_uart-fix-2nd-serial-port-on-mpc8560-ads.patch
cpm_uart-use-schedule_timeout-instead-of-direct-call-to.patch
cpm_uart-fix-baseaddress-for-smc-1-and-2.patch
ppc32-cleaned-up-global-namespace-of-book-e-watchdog.patch
ppc32-removed-find_namec.patch
ppc32-ppc_sys-system-on-chip-identification-additions.patch
ppc32-add-config_hz.patch
From: Kumar Gala <[EMAIL PROTECTED]>
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: Rune Torgersen <[EMAIL PROTECTED]>
Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 ++
1 files changed, 2 insertions(+)
diff -puN
drivers/serial/cpm_uart/cpm_uart_cpm2.c~cpm_uart-fix-baseaddress-for-smc-1-and-2
drivers/serial/cpm_uart/cpm_uart_cpm2.c
---
devel/drivers/serial/cpm_uart/cpm_uart_cpm2.c~cpm_uart-fix-baseaddress-for-smc-1-and-2
2005-08-30 00:15:05.000000000 -0700
+++ devel-akpm/drivers/serial/cpm_uart/cpm_uart_cpm2.c 2005-08-30
00:15:05.000000000 -0700
@@ -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);
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
