cpm_uart: OF-related updates
PATCH 1/1 cpm_uart: OF-related updates
This makes cpm uart able to work using OF-passed parameters in case of CPM1 stuff (found on most mpc8xx reference and custom boards).
---
drivers/serial/cpm_uart/cpm_uart_cpm1.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
drivers/serial/cpm_uart/cpm_uart_cpm1.c +11 -6
@@ -40,6 +40,7 @@ #include <linux/dma-mapping.h>#include <asm/io.h> #include <asm/irq.h> +#include <asm/fs_pd.h> #include <linux/serial_core.h> #include <linux/kernel.h>
@@ -145,7 +146,11 @@ int cpm_uart_allocbuf(struct uart_cpm_po/* was hostalloc but changed cause it blows away the */ /* large tlb mapping when pinning the kernel area */ mem_addr = (u8 *)cpm_dpram_addr (cpm_dpalloc (memsz,8 )); +#ifdef CONFIG_PPC_MERGE + dma_addr = (u32 )cpm_dpram_phys (mem_addr); +#else dma_addr = (u32 )mem_addr; +#endif }else mem_addr =dma_alloc_coherent (NULL , memsz, &dma_addr,GFP_KERNEL );
@@ -205,7 +210,7 @@ # endif (unsigned long )&cpmp->cp_smc[0 ]; cpm_uart_ports[UART_SMC1 ].smcp->smc_smcm |= (SMCM_RX |SMCM_TX ); cpm_uart_ports[UART_SMC1 ].smcp->smc_smcmr &= ~(SMCMR_REN |SMCMR_TEN ); - cpm_uart_ports[UART_SMC1 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SMC1 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SMC1 ;#endif
@@ -217,7 +222,7 @@ #ifdef CONFIG_SERIAL_CPM_SMC2 (unsigned long )&cpmp->cp_smc[1 ]; cpm_uart_ports[UART_SMC2 ].smcp->smc_smcm |= (SMCM_RX |SMCM_TX ); cpm_uart_ports[UART_SMC2 ].smcp->smc_smcmr &= ~(SMCMR_REN |SMCMR_TEN ); - cpm_uart_ports[UART_SMC2 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SMC2 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SMC2 ;#endif
@@ -231,7 +236,7 @@ #ifdef CONFIG_SERIAL_CPM_SCC1 ~(UART_SCCM_TX |UART_SCCM_RX ); cpm_uart_ports[UART_SCC1 ].sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR |SCC_GSMRL_ENT ); - cpm_uart_ports[UART_SCC1 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SCC1 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SCC1 ;#endif
@@ -245,7 +250,7 @@ #ifdef CONFIG_SERIAL_CPM_SCC2 ~(UART_SCCM_TX |UART_SCCM_RX ); cpm_uart_ports[UART_SCC2 ].sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR |SCC_GSMRL_ENT ); - cpm_uart_ports[UART_SCC2 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SCC2 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SCC2 ;#endif
@@ -259,7 +264,7 @@ #ifdef CONFIG_SERIAL_CPM_SCC3 ~(UART_SCCM_TX |UART_SCCM_RX ); cpm_uart_ports[UART_SCC3 ].sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR |SCC_GSMRL_ENT ); - cpm_uart_ports[UART_SCC3 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SCC3 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SCC3 ;#endif
@@ -273,7 +278,7 @@ #ifdef CONFIG_SERIAL_CPM_SCC4 ~(UART_SCCM_TX |UART_SCCM_RX ); cpm_uart_ports[UART_SCC4 ].sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR |SCC_GSMRL_ENT ); - cpm_uart_ports[UART_SCC4 ].port.uartclk = (((bd_t *) __res)->bi_intfreq); + cpm_uart_ports[UART_SCC4 ].port.uartclk =uart_clock (); cpm_uart_port_map[cpm_uart_nr++] =UART_SCC4 ;#endif return 0 ;