| Message ID | 1477055857-17936-21-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 80951f04c3f925330104403ec90ee5a8bb5de763 |
| Delegated to: | Simon Horman |
| Headers | show |
On 10/21/2016 04:17 PM, Geert Uytterhoeven wrote: > Now the R-Car Gen2 CPG clock driver obtains the state of the mode pins > from the R-Car RST driver, there's no longer a need to pass this state > explicitly. Hence we can just call of_clk_init() instead. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Dirk Behme <dirk.behme@de.bosch.com> > --- > v4: > - Add Acked-by, > - Rebase on top of "ARM: shmobile: rcar-gen2: Obtain extal frequency > from DT", > - Remove the call to rcar_gen2_read_mode_pins(), > > v3: > - Drop "select MFD_SYSCON", as the clock driver no longer uses syscon, > > v2: > - Kill compiler warning if CONFIG_ARM_ARCH_TIMER is not enabled. > --- > arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c > index afb9fdcd3d9084e2..b527258e0a62e806 100644 > --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c > +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c [...] > @@ -130,7 +129,7 @@ void __init rcar_gen2_timer_init(void) > iounmap(base); > #endif /* CONFIG_ARM_ARCH_TIMER */ > > - rcar_gen2_clocks_init(mode); > + of_clk_init(NULL); > clocksource_probe(); > } > This hunk no longer applies to devel. MBR, Sergei
On Tue, Nov 1, 2016 at 2:35 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: >> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c >> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c > > [...] >> >> @@ -130,7 +129,7 @@ void __init rcar_gen2_timer_init(void) >> iounmap(base); >> #endif /* CONFIG_ARM_ARCH_TIMER */ >> >> - rcar_gen2_clocks_init(mode); >> + of_clk_init(NULL); >> clocksource_probe(); >> } >> > > This hunk no longer applies to devel. Indeed, but I can't update it, as we can't have all mach-shmobile changes in the clock tree. So Simon will have to resolve the conflict later. 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
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index afb9fdcd3d9084e2..b527258e0a62e806 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include <linux/clk/renesas.h> +#include <linux/clk-provider.h> #include <linux/clocksource.h> #include <linux/device.h> #include <linux/dma-contiguous.h> @@ -71,7 +71,6 @@ static unsigned int __init get_extal_freq(void) void __init rcar_gen2_timer_init(void) { - u32 mode = rcar_gen2_read_mode_pins(); #ifdef CONFIG_ARM_ARCH_TIMER void __iomem *base; u32 freq; @@ -130,7 +129,7 @@ void __init rcar_gen2_timer_init(void) iounmap(base); #endif /* CONFIG_ARM_ARCH_TIMER */ - rcar_gen2_clocks_init(mode); + of_clk_init(NULL); clocksource_probe(); }