From: Nobuhiro Iwamatsu Date: Wed, 24 Nov 2010 04:42:13 +0000 (+0900) Subject: sh: serial_sh: Fix build in serial_sh X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=f3038cde9fc9d7a2c5e3465a2aa497beb1fa199a;p=karo-tx-uboot.git sh: serial_sh: Fix build in serial_sh The serial of ap325rxa has it of two kinds, and the setting of the clock is different. Because there was a problem by function to judge serial kind, this revised it. Signed-off-by: Nobuhiro Iwamatsu --- diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index 54e94e5bf1..e19593c66e 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -675,14 +675,14 @@ static inline int sci_rxd_in(struct uart_port *port) #define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1) #elif defined(CONFIG_CPU_SH7723) ||\ defined(CONFIG_CPU_SH7724) -static inline int scbrr_calc(struct uart_port *port, int bps, int clk) +static inline int scbrr_calc(struct uart_port port, int bps, int clk) { - if (port->type == PORT_SCIF) + 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) +#define SCBRR_VALUE(bps, clk) scbrr_calc(sh_sci, bps, clk) #elif defined(__H8300H__) || defined(__H8300S__) #define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1) #else /* Generic SH */