| Message ID | 1442936646-30362-5-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Tue, Sep 22, 2015 at 5:44 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > --- a/drivers/clk/shmobile/clk-rcar-gen2.c > +++ b/drivers/clk/shmobile/clk-rcar-gen2.c > @@ -431,7 +431,7 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) > > of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data); > > - cpg_mstp_add_clk_domain(np); > + cpg_mssr_add_clk_domain(np); Of course this should become conditional on the presence of the new "renesas,r8a7791-cpg-mssr" compatible value, to preserve backwards-compatibility with old DTSes. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Geert, On Tue, Sep 29, 2015 at 9:48 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Tue, Sep 22, 2015 at 5:44 PM, Geert Uytterhoeven > <geert+renesas@glider.be> wrote: >> --- a/drivers/clk/shmobile/clk-rcar-gen2.c >> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c >> @@ -431,7 +431,7 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) >> >> of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data); >> >> - cpg_mstp_add_clk_domain(np); >> + cpg_mssr_add_clk_domain(np); > > Of course this should become conditional on the presence of the new > "renesas,r8a7791-cpg-mssr" compatible value, to preserve > backwards-compatibility with old DTSes. Yeah, and we should probably link in both clk-mstp.o and clk-mssr.o for older SoCs. Cheers, / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Magnus, On Tue, Sep 29, 2015 at 3:30 PM, Magnus Damm <magnus.damm@gmail.com> wrote: > On Tue, Sep 29, 2015 at 9:48 PM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: >> On Tue, Sep 22, 2015 at 5:44 PM, Geert Uytterhoeven >> <geert+renesas@glider.be> wrote: >>> --- a/drivers/clk/shmobile/clk-rcar-gen2.c >>> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c >>> @@ -431,7 +431,7 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) >>> >>> of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data); >>> >>> - cpg_mstp_add_clk_domain(np); >>> + cpg_mssr_add_clk_domain(np); >> >> Of course this should become conditional on the presence of the new >> "renesas,r8a7791-cpg-mssr" compatible value, to preserve >> backwards-compatibility with old DTSes. > > Yeah, and we should probably link in both clk-mstp.o and clk-mssr.o > for older SoCs. Yep, been there, done that (local code updated and working ;-) The conditional in drivers/sh/pm_runtime.c is getting a bit too gory for my appetite. I think we should make PM (and thus PM_GENERIC_DOMAINS) mandatory. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile index 2525ba9608b69732..f595a028a581a271 100644 --- a/drivers/clk/shmobile/Makefile +++ b/drivers/clk/shmobile/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7778) += clk-r8a7778.o clk-mstp.o obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o clk-mstp.o obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o clk-mstp.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-mstp.o clk-div6.o +obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-mssr.o clk-div6.o obj-$(CONFIG_ARCH_R8A7793) += clk-rcar-gen2.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7795) += clk-rcar-gen3.o clk-mstp.o clk-div6.o diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c index 3f02b40b4911831c..a237d63af1ede4f6 100644 --- a/drivers/clk/shmobile/clk-rcar-gen2.c +++ b/drivers/clk/shmobile/clk-rcar-gen2.c @@ -431,7 +431,7 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data); - cpg_mstp_add_clk_domain(np); + cpg_mssr_add_clk_domain(np); } CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks", rcar_gen2_cpg_clocks_init);
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/clk/shmobile/Makefile | 2 +- drivers/clk/shmobile/clk-rcar-gen2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)