MSM serial driver update for 2.6.35
Hi Linus,
Just one fix for our serial driver to get it working with MSM7x30,
which was added this merge window.
Daniel
The following changes since commit be1066bbcd443a65df312fdecea7e4959adedb45:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (2010-04-30 10:16:55 -0700)
are available in the git repository at:
git://codeaurora.org/quic/kernel/dwalker/linux-msm.git msm-serial
Abhijeet Dharmapurikar (1):
msm: serial: fix serial on MSM7x30
drivers/serial/msm_serial.c | 21 ++------------- drivers/serial/msm_serial.h | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 18 deletions(-)
drivers/serial/msm_serial.c +3 -18
@@ -41,19 +41,6 @@ struct msm_port {unsigned int imr; }; -#define UART_TO_MSM (uart_port) ((struct msm_port *) uart_port) - -static inline void msm_write (struct uart_port *port,unsigned int val, -unsigned int off) -{ -__raw_writel (val, port->membase + off); -} - -static inline unsigned int msm_read (struct uart_port *port,unsigned int off) -{ -return __raw_readl (port->membase + off); -} -static void msm_stop_tx (struct uart_port *port) {struct msm_port *msm_port =UART_TO_MSM (port);
@@ -320,11 +307,7 @@ static void msm_init_clock(struct uart_port *port)struct msm_port *msm_port =UART_TO_MSM (port);clk_enable (msm_port->clk); - -msm_write (port,0xC0 ,UART_MREG ); -msm_write (port,0xB2 ,UART_NREG ); -msm_write (port,0x7D ,UART_DREG ); -msm_write (port,0x1C ,UART_MNDREG ); +msm_serial_set_mnd_regs (port); }static int msm_startup (struct uart_port *port)
@@ -706,6 +689,8 @@ static int __init msm_serial_probe(struct platform_device *pdev)if (unlikely (IS_ERR (msm_port->clk)))return PTR_ERR (msm_port->clk); port->uartclk =clk_get_rate (msm_port->clk); +printk (KERN_INFO "uartclk = %d\n" , port->uartclk); + resource =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (unlikely (!resource))
drivers/serial/msm_serial.h +56 -0
60 lines not on this page · raw message