serial: sh: Change The definition of clock of SCIF
PATCH v2 1/4 serial: sh: Change The definition of clock of SCIF
The former SH/SCIF driver had calculated baudrate based on CONFIG_SYS_CLK_FREQ. The newest SH/SCIF needs calculation of the clock for SCIF.
This patch defines clock CONFIG_SH_SCIF_CLK_FREQ for SCIF and changes it to CONFIG_SH_SCIF_CLK_FREQ from CONFIG_SYS_CLK_FREQ.
---
v2: no changes.
re-send as further series.
drivers/serial/serial_sh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/serial/serial_sh.c +3 -1
@@ -48,7 +48,9 @@ static struct uart_port sh_sci = {static void sh_serial_setbrg (void ) {DECLARE_GLOBAL_DATA_PTR ; -sci_out (&sh_sci,SCBRR ,SCBRR_VALUE (gd->baudrate,CONFIG_SYS_CLK_FREQ )); + +sci_out (&sh_sci,SCBRR , +SCBRR_VALUE (gd->baudrate,CONFIG_SH_SCIF_CLK_FREQ )); }static int sh_serial_init (void )
Signature · 1 line
1.8.4.rc3
PATCH v2 2/4 sh: boards: Change clock definition of SCIF and TMU
This changes clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ, and clock definition of TMU from CONFIG_SYS_CLK_FREQ to CONFIG_SH_TMU_CLK_FREQ for boards.
---
v2: no changes.
re-send as further series.
include/configs/MigoR.h | 2 ++ include/configs/ap325rxa.h | 2 ++ include/configs/ap_sh4a_4a.h | 2 ++ include/configs/ecovec.h | 2 ++ include/configs/espt.h | 2 ++ include/configs/mpr2.h | 2 ++ include/configs/ms7720se.h | 2 ++ include/configs/ms7722se.h | 2 ++ include/configs/ms7750se.h | 2 ++ include/configs/r0p7734.h | 2 ++ include/configs/r2dplus.h | 2 ++ include/configs/r7780mp.h | 2 ++ include/configs/rsk7203.h | 2 ++ include/configs/rsk7264.h | 2 ++ include/configs/rsk7269.h | 2 ++ include/configs/sh7752evb.h | 2 ++ include/configs/sh7757lcr.h | 2 ++ include/configs/sh7763rdp.h | 2 ++ include/configs/sh7785lcr.h | 2 ++ include/configs/shmin.h | 2 ++ 20 files changed, 40 insertions(+)
include/configs/MigoR.h +2 -0
@@ -123,6 +123,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV (4)/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/ap325rxa.h +2 -0
@@ -155,6 +155,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV (4)/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/ap_sh4a_4a.h +2 -0
@@ -158,6 +158,8 @@#else #define CONFIG_SYS_CLK_FREQ 44444444#endif +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/ecovec.h +2 -0
@@ -179,6 +179,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 41666666 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/espt.h +2 -0
@@ -98,6 +98,8 @@/* Clock */ #define CONFIG_SYS_CLK_FREQ 66666666 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/mpr2.h +2 -0
@@ -67,6 +67,8 @@/* Clocks */ #define CONFIG_SYS_CLK_FREQ 24000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/ms7720se.h +2 -0
@@ -85,6 +85,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/ms7722se.h +2 -0
@@ -111,6 +111,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV (4)/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/ms7750se.h +2 -0
@@ -82,6 +82,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/r0p7734.h +2 -0
@@ -164,6 +164,8 @@#else #define CONFIG_SYS_CLK_FREQ 44444444#endif +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/r2dplus.h +2 -0
@@ -77,6 +77,8 @@* SuperH Clock setting */ #define CONFIG_SYS_CLK_FREQ 60000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_PLL_SETTLING_TIME 100/* in us */
include/configs/r7780mp.h +2 -0
@@ -102,6 +102,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/rsk7203.h +2 -0
@@ -85,6 +85,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CMT_CLK_DIVIDER 32/* 8 (default), 32, 128 or 512 */ #define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7264.h +2 -0
@@ -65,6 +65,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 36000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CMT_CLK_DIVIDER 32/* 8 (default), 32, 128 or 512 */ #define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7269.h +2 -0
@@ -64,6 +64,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 66125000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CMT_CLK_DIVIDER 32/* 8 (default), 32, 128 or 512 */ #define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/sh7752evb.h +2 -0
@@ -132,6 +132,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 48000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000#endif /* __SH7752EVB_H */
include/configs/sh7757lcr.h +2 -0
@@ -140,6 +140,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 48000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000#endif /* __SH7757LCR_H */
include/configs/sh7763rdp.h +2 -0
@@ -98,6 +98,8 @@/* Clock */ #define CONFIG_SYS_CLK_FREQ 66666666 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV (4)/* 4 (default), 16, 64, 256 or 1024 */ #define CONFIG_SYS_HZ 1000
include/configs/sh7785lcr.h +2 -0
@@ -172,6 +172,8 @@/* Board Clock */ /* The SCIF used external clock. system clock only used timer. */ #define CONFIG_SYS_CLK_FREQ 50000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
include/configs/shmin.h +2 -0
@@ -103,6 +103,8 @@#else #define CONFIG_SYS_CLK_FREQ 33333333#endif /* CONFIG_T_SH7706LSR */ +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
Signature · 1 line
1.8.4.rc3
PATCH v2 3/4 arm: rmobile: kzm9g: Change clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ
In reply to Nobuhiro Iwamatsu---
v2: no changes.
re-send as further series.
include/configs/kzm9g.h | 1 + 1 file changed, 1 insertion(+)
include/configs/kzm9g.h +1 -0
@@ -125,6 +125,7 @@#define CONFIG_GLOBAL_TIMER #define CONFIG_SYS_CLK_FREQ (48000000)#define CONFIG_SYS_CPU_CLK (1196000000) +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define TMU_CLK_DIVIDER (4)/* 4 (default), 16, 64, 256 or 1024 */ #define CFG_HZ (1000)#define CONFIG_SYS_HZ CFG_HZ
Signature · 1 line
1.8.4.rc3
PATCH v2 3/4 arm: rmobile: kzm9g: Change clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ
Quoted 7 lines · Nobuhiro Iwamatsu
Signed-off-by Nobuhiro Iwamatsu <[email protected]>CC Nobuhiro Iwamatsu <[email protected]>CC Albert Aribaud <[email protected]>---
v2: no changes.
re-send as further series.
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131023/ab3d43d5/attachment.pgp>
PATCH v2 4/4 arm: rmobile: armadillo-800eva: Change clock definition of SCIF and TMU
In reply to Nobuhiro IwamatsuThis changes clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ, and clock definition of TMU from CONFIG_SYS_CLK_FREQ to CONFIG_SH_TMU_CLK_FREQ,
---
v2: no changes.
re-send as further series.
include/configs/armadillo-800eva.h | 2 ++ 1 file changed, 2 insertions(+)
include/configs/armadillo-800eva.h +2 -0
@@ -138,6 +138,8 @@/* Board Clock */ #define CONFIG_SYS_CLK_FREQ 50000000 +#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ#define CONFIG_SYS_TMU_CLK_DIV 4#define CONFIG_SYS_HZ 1000
Signature · 1 line
1.8.4.rc3
PATCH v2 4/4 arm: rmobile: armadillo-800eva: Change clock definition of SCIF and TMU
Quoted 7 lines · Nobuhiro Iwamatsu
This changes clock definition of SCIF from
CONFIG_SYS_CLK_FREQtoCONFIG_SH_SCIF_CLK_FREQ, and clock definition of TMU fromCONFIG_SYS_CLK_FREQtoCONFIG_SH_TMU_CLK_FREQ,Signed-off-by Nobuhiro Iwamatsu <[email protected]>CC Nobuhiro Iwamatsu <[email protected]>CC Albert Aribaud <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131023/b6c7f56d/attachment.pgp>