From 44ba1fbb1079c4837bbebd49844d9ef13626ad10 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 3 Oct 2008 17:37:31 +0900 Subject: [PATCH] --- yaml --- r: 116185 b: refs/heads/master c: ba1d28181c586deec468cc6ae558c0c099f1b956 h: refs/heads/master i: 116183: 2c36400d0b6da4dfa7ace55fb0effed22fbb1a15 v: v3 --- [refs] | 2 +- trunk/drivers/serial/sh-sci.h | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae120e8cf5eb..b0480121765a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f400f510df4e29bd00ffe07981ec703070cb9e19 +refs/heads/master: ba1d28181c586deec468cc6ae558c0c099f1b956 diff --git a/trunk/drivers/serial/sh-sci.h b/trunk/drivers/serial/sh-sci.h index 511c10d42187..7cd28b226800 100644 --- a/trunk/drivers/serial/sh-sci.h +++ b/trunk/drivers/serial/sh-sci.h @@ -789,7 +789,14 @@ static inline int sci_rxd_in(struct uart_port *port) defined(CONFIG_CPU_SUBTYPE_SH7721) #define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1) #elif defined(CONFIG_CPU_SUBTYPE_SH7723) -#define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(16*bps)-1) +static inline int scbrr_calc(struct uart_port *port, int bps, int clk) +{ + if (port->type == PORT_SCIF) + return (clk+16*bps)/(32*bps)-1; + else + return ((clk*2)+16*bps)/(16*bps)-1; +} +#define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk) #elif defined(__H8300H__) || defined(__H8300S__) #define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1) #else /* Generic SH */