diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-08-26 15:55:03 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-08-26 15:55:03 +0200 |
| commit | bd061a5214e60c9d1bb24393933323bd1a2dae19 (patch) | |
| tree | a24e13ecb6b710ad4124068de77fc2752f622be6 /drivers | |
| parent | 98e99e5a48e8eb3987c89f5316929313601ed7d6 (diff) | |
| parent | fe0ddffac1ce63de71fe8e6398c4784937b52c84 (diff) | |
| download | blackbird-obmc-uboot-bd061a5214e60c9d1bb24393933323bd1a2dae19.tar.gz blackbird-obmc-uboot-bd061a5214e60c9d1bb24393933323bd1a2dae19.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
* 'master' of git://git.denx.de/u-boot-sh:
sh: add calling mmc_initialize in board.c
sh: sh7757lcr: Add KEEP order to start.o section
usb: r8a66597: Fix argument mistake of inl
sh: Clean up rsk7264 board settings
sh: sh2a: Add sh2a optimize to config.mk
sh: Fix rsk7203 alignment problem
sh: Add support for SH2A freestanding build
sh: Add Renesas rsk7264 board
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_sh.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index e19593c66e..4e16e4803c 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -177,7 +177,8 @@ struct uart_port { #elif defined(CONFIG_CPU_SH7201) || \ defined(CONFIG_CPU_SH7203) || \ defined(CONFIG_CPU_SH7206) || \ - defined(CONFIG_CPU_SH7263) + defined(CONFIG_CPU_SH7263) || \ + defined(CONFIG_CPU_SH7264) # define SCSPTR0 0xfffe8020 /* 16 bit SCIF */ # define SCSPTR1 0xfffe8820 /* 16 bit SCIF */ # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */ @@ -685,6 +686,8 @@ 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 |
