| Message ID | 1401716424-29740-2-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 06/02/2014 05:40 PM, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > arch/arm/mach-shmobile/clock-r8a7791.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c > index e2fdfcc14436..b0b2294513e2 100644 > --- a/arch/arm/mach-shmobile/clock-r8a7791.c > +++ b/arch/arm/mach-shmobile/clock-r8a7791.c > @@ -178,7 +178,7 @@ enum { > MSTP719, MSTP718, MSTP715, MSTP714, > MSTP522, > MSTP314, MSTP312, MSTP311, > - MSTP216, MSTP207, MSTP206, > + MSTP219, MSTP218, MSTP216, MSTP207, MSTP206, I'd put the latter two on a separate line or on the same line with the following three. > MSTP204, MSTP203, MSTP202, > MSTP124, > MSTP_NR > @@ -215,6 +215,8 @@ static struct clk mstp_clks[MSTP_NR] = { > [MSTP312] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD1], SMSTPCR3, 12, MSTPSR3, 0), /* SDHI1 */ > [MSTP311] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD2], SMSTPCR3, 11, MSTPSR3, 0), /* SDHI2 */ > [MSTP216] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 16, MSTPSR2, 0), /* SCIFB2 */ > + [MSTP219] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 19, MSTPSR2, 0), /* SYS-DMAC0 */ > + [MSTP218] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 18, MSTPSR2, 0), /* SYS-DMAC1 */ I think these 2 clocks should precede SCIFB2 clock. > [MSTP207] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 7, MSTPSR2, 0), /* SCIFB1 */ > [MSTP206] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 6, MSTPSR2, 0), /* SCIFB0 */ > [MSTP204] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 4, MSTPSR2, 0), /* SCIFA0 */ WBR, Sergei
Hi Sergei, On Mon, Jun 2, 2014 at 8:13 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: >> diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c >> b/arch/arm/mach-shmobile/clock-r8a7791.c >> index e2fdfcc14436..b0b2294513e2 100644 >> --- a/arch/arm/mach-shmobile/clock-r8a7791.c >> +++ b/arch/arm/mach-shmobile/clock-r8a7791.c >> @@ -178,7 +178,7 @@ enum { >> MSTP719, MSTP718, MSTP715, MSTP714, >> MSTP522, >> MSTP314, MSTP312, MSTP311, >> - MSTP216, MSTP207, MSTP206, >> + MSTP219, MSTP218, MSTP216, MSTP207, MSTP206, > > I'd put the latter two on a separate line or on the same line with the > following three. > >> MSTP204, MSTP203, MSTP202, >> MSTP124, >> MSTP_NR >> @@ -215,6 +215,8 @@ static struct clk mstp_clks[MSTP_NR] = { >> [MSTP312] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD1], SMSTPCR3, 12, >> MSTPSR3, 0), /* SDHI1 */ >> [MSTP311] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD2], SMSTPCR3, 11, >> MSTPSR3, 0), /* SDHI2 */ >> [MSTP216] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 16, MSTPSR2, 0), >> /* SCIFB2 */ >> + [MSTP219] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 19, MSTPSR2, 0), >> /* SYS-DMAC0 */ >> + [MSTP218] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 18, MSTPSR2, 0), >> /* SYS-DMAC1 */ > > I think these 2 clocks should precede SCIFB2 clock. > >> [MSTP207] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 7, MSTPSR2, 0), >> /* SCIFB1 */ >> [MSTP206] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 6, MSTPSR2, 0), >> /* SCIFB0 */ >> [MSTP204] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 4, MSTPSR2, 0), >> /* SCIFA0 */ My local patches still have the MSIOF entries as well. Unfortunately MSTP values are not always contiguous (MSIOF, SYS-DMAC, and SCIF are mixed). So this is the end result of rebasing that on top of Simon's current tree. Anyway, I think the legacy series is mostly posted for reference, as I'm under the impression Simon will no longer apply patches adding features to the legacy code. Simon, is that correct? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tue, Jun 03, 2014 at 09:04:01AM +0200, Geert Uytterhoeven wrote: > Hi Sergei, > > On Mon, Jun 2, 2014 at 8:13 PM, Sergei Shtylyov > <sergei.shtylyov@cogentembedded.com> wrote: > >> diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c > >> b/arch/arm/mach-shmobile/clock-r8a7791.c > >> index e2fdfcc14436..b0b2294513e2 100644 > >> --- a/arch/arm/mach-shmobile/clock-r8a7791.c > >> +++ b/arch/arm/mach-shmobile/clock-r8a7791.c > >> @@ -178,7 +178,7 @@ enum { > >> MSTP719, MSTP718, MSTP715, MSTP714, > >> MSTP522, > >> MSTP314, MSTP312, MSTP311, > >> - MSTP216, MSTP207, MSTP206, > >> + MSTP219, MSTP218, MSTP216, MSTP207, MSTP206, > > > > I'd put the latter two on a separate line or on the same line with the > > following three. > > > >> MSTP204, MSTP203, MSTP202, > >> MSTP124, > >> MSTP_NR > >> @@ -215,6 +215,8 @@ static struct clk mstp_clks[MSTP_NR] = { > >> [MSTP312] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD1], SMSTPCR3, 12, > >> MSTPSR3, 0), /* SDHI1 */ > >> [MSTP311] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD2], SMSTPCR3, 11, > >> MSTPSR3, 0), /* SDHI2 */ > >> [MSTP216] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 16, MSTPSR2, 0), > >> /* SCIFB2 */ > >> + [MSTP219] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 19, MSTPSR2, 0), > >> /* SYS-DMAC0 */ > >> + [MSTP218] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 18, MSTPSR2, 0), > >> /* SYS-DMAC1 */ > > > > I think these 2 clocks should precede SCIFB2 clock. > > > >> [MSTP207] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 7, MSTPSR2, 0), > >> /* SCIFB1 */ > >> [MSTP206] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 6, MSTPSR2, 0), > >> /* SCIFB0 */ > >> [MSTP204] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 4, MSTPSR2, 0), > >> /* SCIFA0 */ > > My local patches still have the MSIOF entries as well. Unfortunately MSTP > values are not always contiguous (MSIOF, SYS-DMAC, and SCIF are mixed). > So this is the end result of rebasing that on top of Simon's current tree. > > Anyway, I think the legacy series is mostly posted for reference, as I'm > under the impression Simon will no longer apply patches adding features > to the legacy code. Simon, is that correct? Yes, that is correct.
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c index e2fdfcc14436..b0b2294513e2 100644 --- a/arch/arm/mach-shmobile/clock-r8a7791.c +++ b/arch/arm/mach-shmobile/clock-r8a7791.c @@ -178,7 +178,7 @@ enum { MSTP719, MSTP718, MSTP715, MSTP714, MSTP522, MSTP314, MSTP312, MSTP311, - MSTP216, MSTP207, MSTP206, + MSTP219, MSTP218, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP124, MSTP_NR @@ -215,6 +215,8 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP312] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD1], SMSTPCR3, 12, MSTPSR3, 0), /* SDHI1 */ [MSTP311] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD2], SMSTPCR3, 11, MSTPSR3, 0), /* SDHI2 */ [MSTP216] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 16, MSTPSR2, 0), /* SCIFB2 */ + [MSTP219] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 19, MSTPSR2, 0), /* SYS-DMAC0 */ + [MSTP218] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 18, MSTPSR2, 0), /* SYS-DMAC1 */ [MSTP207] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 7, MSTPSR2, 0), /* SCIFB1 */ [MSTP206] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 6, MSTPSR2, 0), /* SCIFB0 */ [MSTP204] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 4, MSTPSR2, 0), /* SCIFA0 */ @@ -267,6 +269,8 @@ static struct clk_lookup lookups[] = { CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.0", &mstp_clks[MSTP124]), CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]), CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), + CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP219]), + CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP218]), CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]), CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]), CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/clock-r8a7791.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)