summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPhil Edworthy <PHIL.EDWORTHY@renesas.com>2012-02-13 02:03:50 +0000
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2012-03-08 10:26:32 +0900
commit117029c510c75f4c6d7ecb1172635d6a08755cf8 (patch)
tree819ad596bbdaba266d81d82b9e615c4f05f23322 /drivers
parent73dba948f57f0d69cb63ee168155c51d0c33f2b8 (diff)
downloadblackbird-obmc-uboot-117029c510c75f4c6d7ecb1172635d6a08755cf8.tar.gz
blackbird-obmc-uboot-117029c510c75f4c6d7ecb1172635d6a08755cf8.zip
sh: Fix sh7264 clock speed and related serial setting
The generalised calculation of the serial bit rate reg also applies to sh7264, it was just the clock speed that was set incorrectly. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_sh.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index 4e16e4803c..0b3e779c8e 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -686,8 +686,6 @@ static inline int scbrr_calc(struct uart_port port, int bps, int 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)
-#elif defined(CONFIG_CPU_SH7264)
-#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps))
#else /* Generic SH */
#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1)
#endif
OpenPOWER on IntegriCloud