[PATCH 1/4] ARM: shmobile: r8a7791: Add SYS-DMAC clocks
Geert Uytterhoeven
geert at linux-m68k.org
Tue Jun 3 00:04:01 PDT 2014
Hi Sergei,
On Mon, Jun 2, 2014 at 8:13 PM, Sergei Shtylyov
<sergei.shtylyov at 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 at 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
More information about the linux-arm-kernel
mailing list