On Tue, Oct 25, 2016 at 10:37 AM, Geert Uytterhoeven
<geert@xxxxxxxxxxxxxx> wrote:
> On Fri, Oct 21, 2016 at 11:07 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>> On Friday, October 21, 2016 8:01:49 PM CEST Geert Uytterhoeven wrote:
>>> > diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile
>>> > index 90dd0db7d9c6..762d122eddec 100644
>>> > --- a/drivers/clk/renesas/Makefile
>>> > +++ b/drivers/clk/renesas/Makefile
>>> > @@ -4,11 +4,7 @@ obj-$(CONFIG_ARCH_R8A73A4) += clk-r8a73a4.o clk-div6.o
>>> > obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o clk-div6.o
>>> > obj-$(CONFIG_ARCH_R8A7778) += clk-r8a7778.o
>>> > obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o
>>> > -obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o clk-div6.o
>>> > -obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-div6.o
>>> > -obj-$(CONFIG_ARCH_R8A7792) += clk-rcar-gen2.o clk-div6.o
>>> > -obj-$(CONFIG_ARCH_R8A7793) += clk-rcar-gen2.o clk-div6.o
>>> > -obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o clk-div6.o
>>> > +obj-$(CONFIG_ARCH_RCAR_GEN2) += clk-rcar-gen2.o clk-div6.o
>>> > obj-$(CONFIG_ARCH_R8A7795) += r8a7795-cpg-mssr.o rcar-gen3-cpg.o
>>> > obj-$(CONFIG_ARCH_R8A7796) += r8a7796-cpg-mssr.o rcar-gen3-cpg.o
>>> > obj-$(CONFIG_ARCH_SH73A0) += clk-sh73a0.o clk-div6.o
>>>
>>> Please don't fix it this way, as it will make it _harder_ to convert the R-Car
>>> Gen2 SoCs to the modern CPG/MSSR driver later.
>>
>> Ok, I see. How about just adding another line for r8a7743 and
>> dropping that again after the timer_init has been converted?
>
> That's an option, but it touches a different subsystem ;-)
Alternatively, the call to rcar_gen2_clocks_init() in
arch/arm/mach-shmobile/setup-rcar-gen2.c:rcar_gen2_timer_init()
can be protected temporarily by
#if defined(CONFIG_R8A7790) || ... || defined(CONFIG_R8A7794)
until "[PATCH v4 00/23] soc: renesas: Add R-Car RST driver for
obtaining mode pin state" went it, which will remove that call.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
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
