| Message ID | 1464808880-343-16-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Geert, Thank you for the patch. On Wednesday 01 Jun 2016 21:21:13 Geert Uytterhoeven wrote: > Obtain the values of the mode pins from the R-Car RST driver, which > relies on the presence in DT of a device node for the RST module. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > v3: > - New. > --- > drivers/clk/renesas/r8a7796-cpg-mssr.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c > b/drivers/clk/renesas/r8a7796-cpg-mssr.c index > c84b549c14d2e57d..3db2d1cfc8cd788e 100644 > --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c > +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c > @@ -16,6 +16,7 @@ > #include <linux/device.h> > #include <linux/init.h> > #include <linux/kernel.h> > +#include <linux/soc/renesas/rcar-rst.h> > > #include <dt-bindings/clock/r8a7796-cpg-mssr.h> > > @@ -159,7 +160,12 @@ static const struct rcar_gen3_cpg_pll_config > cpg_pll_configs[16] __initconst = { static int __init > r8a7796_cpg_mssr_init(struct device *dev) > { > const struct rcar_gen3_cpg_pll_config *cpg_pll_config; > - u32 cpg_mode = rcar_gen3_read_mode_pins(); > + u32 cpg_mode; > + int error; > + > + error = rcar_rst_read_mode_pins(&cpg_mode); > + if (error) > + return error; > > cpg_pll_config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)]; > if (!cpg_pll_config->extal_div) {
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index c84b549c14d2e57d..3db2d1cfc8cd788e 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c @@ -16,6 +16,7 @@ #include <linux/device.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/soc/renesas/rcar-rst.h> #include <dt-bindings/clock/r8a7796-cpg-mssr.h> @@ -159,7 +160,12 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[16] __initconst = { static int __init r8a7796_cpg_mssr_init(struct device *dev) { const struct rcar_gen3_cpg_pll_config *cpg_pll_config; - u32 cpg_mode = rcar_gen3_read_mode_pins(); + u32 cpg_mode; + int error; + + error = rcar_rst_read_mode_pins(&cpg_mode); + if (error) + return error; cpg_pll_config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)]; if (!cpg_pll_config->extal_div) {
Obtain the values of the mode pins from the R-Car RST driver, which relies on the presence in DT of a device node for the RST module. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - New. --- drivers/clk/renesas/r8a7796-cpg-mssr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)