[U-Boot] [PATCH v2 1/4] serial: sh: Change The definition of clock of SCIF

Nobuhiro Iwamatsu

30 Sep 2013 30 Sep '13

3:30 a.m.

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.

Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org CC: Albert Aribaud albert.u.boot@aribaud.net --- v2: no changes. re-send as further series.

drivers/serial/serial_sh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index ff2cdc5..67cc0dc 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -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)

-- 1.8.4.rc3

Show replies by date

Nobuhiro Iwamatsu

30 Sep 30 Sep

3:30 a.m.

New subject: [U-Boot] [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.

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index dc4a768..d536ebd 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -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

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index af3a427..07ec8a7 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -155,6 +155,8 @@

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index b911291..ada42d7 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -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

diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 2c9594b..34bd0b3 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -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

diff --git a/include/configs/espt.h b/include/configs/espt.h index e906efb..f1a44bc 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -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

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 7e18723..b0b23a6 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -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

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index bc8bb8d..d6b1762 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -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

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index a757737..787c255 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -111,6 +111,8 @@

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index c4c96bf..37ef02e 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -82,6 +82,8 @@

diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 0804480..5894f5f 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -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

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 65dcffb..8c11b99 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -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 */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index dd1caf1..07c9903 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -102,6 +102,8 @@

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index d7473c3..2e96883 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -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)

diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 783467a..cf7bc63 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -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)

diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 11c2a93..1f4e2f3 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -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)

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index fb4dc6f..bab7e4d 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -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 */ diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index af76f49..b0df4da 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -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 */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index c1d33d8..d0dc102 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -98,6 +98,8 @@

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 04f1d22..baee07b 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -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

diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 5fb7176..8cdb8f9 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -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

-- 1.8.4.rc3

Nobuhiro Iwamatsu

3:30 a.m.

New subject: [U-Boot] [PATCH v2 3/4] arm: rmobile: kzm9g: Change clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ

Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com CC: Nobuhiro Iwamatsu iwamatsu@nigauri.org CC: Albert Aribaud albert.u.boot@aribaud.net --- v2: no changes. re-send as further series.

include/configs/kzm9g.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 222725c..6323050 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -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

-- 1.8.4.rc3

Tom Rini

24 Oct 24 Oct

3:21 a.m.

New subject: [U-Boot] [U-Boot, v2, 3/4] arm: rmobile: kzm9g: Change clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ

On Mon, Sep 30, 2013 at 10:30:40AM +0900, Nobuhiro Iwamatsu wrote:

...

Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com CC: Nobuhiro Iwamatsu iwamatsu@nigauri.org CC: Albert Aribaud albert.u.boot@aribaud.net

v2: no changes. re-send as further series.

Applied to u-boot/master, thanks!

-- Tom

Nobuhiro Iwamatsu

30 Sep 30 Sep

3:30 a.m.

New subject: [U-Boot] [PATCH v2 4/4] arm: rmobile: armadillo-800eva: 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,

include/configs/armadillo-800eva.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 9f357ea..7a264b0 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -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

-- 1.8.4.rc3

Tom Rini

24 Oct 24 Oct

3:21 a.m.

New subject: [U-Boot] [U-Boot, v2, 4/4] arm: rmobile: armadillo-800eva: Change clock definition of SCIF and TMU

On Mon, Sep 30, 2013 at 10:30:41AM +0900, Nobuhiro Iwamatsu wrote:

...

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,

Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com CC: Nobuhiro Iwamatsu iwamatsu@nigauri.org CC: Albert Aribaud albert.u.boot@aribaud.net

Applied to u-boot/master, thanks!

-- Tom

4219

Age (days ago)

4243

Last active (days ago)

List overview

Download

5 comments

2 participants

tags (0)

participants (2)

Nobuhiro Iwamatsu
Tom Rini