msm_serial: fix serial on trout
PATCH 1/1 msm_serial: fix serial on trout
All targets report the correct uartclk except trout. For trout force mnd counter values as if uartclk was fed by tcxo/4. For other targets set the mnd counter based on uartclk.
--- drivers/serial/msm_serial.c | 33 ++++++++++++++++++++++++++++----- drivers/serial/msm_serial.h | 6 ++++++ 2 files changed, 34 insertions(+), 5 deletions(-)
drivers/serial/msm_serial.c +28 -5
@@ -315,16 +315,37 @@ static void msm_reset(struct uart_port *port)msm_write (port,UART_CR_CMD_SET_RFR ,UART_CR ); } + +static void msm_serial_set_mnd_regs_tcxo (struct uart_port *port) +{ +msm_write (port,0x06 ,UART_MREG ); +msm_write (port,0xF1 ,UART_NREG ); +msm_write (port,0x0F ,UART_DREG ); +msm_write (port,0x1A ,UART_MNDREG ); +} + +static void msm_serial_set_mnd_regs_tcxoby4 (struct uart_port *port) +{ +msm_write (port,0x18 ,UART_MREG ); +msm_write (port,0xF6 ,UART_NREG ); +msm_write (port,0x0F ,UART_DREG ); +msm_write (port,0x0A ,UART_MNDREG ); +} + +static void msm_serial_set_mnd_regs_from_uartclk (struct uart_port *port) +{ +if (port->uartclk ==19200000 ) +msm_serial_set_mnd_regs_tcxo (port); +else +msm_serial_set_mnd_regs_tcxoby4 (port); +} +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 +727,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 +6 -0
@@ -114,4 +114,10 @@#define UART_MISR 0x0010#define UART_ISR 0x0014 +#ifdef CONFIG_MACH_TROUT +#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_tcxoby4 +#else +#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_from_uartclk +#endif +#endif /* __DRIVERS_SERIAL_MSM_SERIAL_H */
Signature · 1 line
1.5.6.3
Quoted 4 lines · Abhijeet Dharmapurikar
All targets report the correct uartclk except trout. For trout force mnd counter values as if uartclk was fed by tcxo/4. For other targets set the mnd counter based on uartclk.
Can you be more specific in the description here. It sounds like your fixing a problem with trout serial, but trout serial works fine.
Daniel
PATCH 1/1 msm_serial: fix serial on trout
Set the mnd counter based on uartclk.This fixes a problem on 7x30 where the uartclk is 19.2Mhz rather than the usual 4.8Mhz.
Trout incorrectly reports uartclk to be running at 19.2Mhz It is actually running at 4.8Mhz. For trout force mnd counter values as if uartclk was fed by tcxo/4.
--- drivers/serial/msm_serial.c | 33 ++++++++++++++++++++++++++++----- drivers/serial/msm_serial.h | 6 ++++++ 2 files changed, 34 insertions(+), 5 deletions(-)
drivers/serial/msm_serial.c +28 -5
@@ -315,16 +315,37 @@ static void msm_reset(struct uart_port *port)msm_write (port,UART_CR_CMD_SET_RFR ,UART_CR ); } + +static void msm_serial_set_mnd_regs_tcxo (struct uart_port *port) +{ +msm_write (port,0x06 ,UART_MREG ); +msm_write (port,0xF1 ,UART_NREG ); +msm_write (port,0x0F ,UART_DREG ); +msm_write (port,0x1A ,UART_MNDREG ); +} + +static void msm_serial_set_mnd_regs_tcxoby4 (struct uart_port *port) +{ +msm_write (port,0x18 ,UART_MREG ); +msm_write (port,0xF6 ,UART_NREG ); +msm_write (port,0x0F ,UART_DREG ); +msm_write (port,0x0A ,UART_MNDREG ); +} + +static void msm_serial_set_mnd_regs_from_uartclk (struct uart_port *port) +{ +if (port->uartclk ==19200000 ) +msm_serial_set_mnd_regs_tcxo (port); +else +msm_serial_set_mnd_regs_tcxoby4 (port); +} +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 +727,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 +6 -0
@@ -114,4 +114,10 @@#define UART_MISR 0x0010#define UART_ISR 0x0014 +#ifdef CONFIG_MACH_TROUT +#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_tcxoby4 +#else +#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_from_uartclk +#endif +#endif /* __DRIVERS_SERIAL_MSM_SERIAL_H */
Signature · 1 line
1.5.6.3
Quoted 9 lines · Abhijeet Dharmapurikar
Set the mnd counter based on uartclk.This fixes a problem on 7x30 where the uartclk is 19.2Mhz rather than the usual 4.8Mhz.
Trout incorrectly reports uartclk to be running at 19.2Mhz It is actually running at 4.8Mhz. For trout force mnd counter values as if uartclk was fed by tcxo/4.Signed-off-by Abhijeet Dharmapurikar <[email protected]>---
couple of changes ..
Subject: [PATCH] msm: serial: fix serial on MSM7x30
Set the mnd counter based on uartclk. This fixes a problem on 7x30 where the uartclk is 19.2Mhz rather than the usual 4.8Mhz.
Trout incorrectly reports uartclk to be running at 19.2Mhz It is actually running at 4.8Mhz. For trout force mnd counter values as if uartclk was fed by tcxo/4.
--- 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
Signature · 1 line
1.7.1