| From a0ed88e4737b4e0c8f11accc016cc584891b48e8 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 1 Jun 2016 14:54:10 +0200 |
| Subject: [PATCH 182/299] clk: renesas: r8a7795: Obtain mode pin values from |
| R-Car RST driver |
| |
| 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> |
| Acked-by: Dirk Behme <dirk.behme@de.bosch.com> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| (cherry picked from commit 969921e0d2b5a582aa6a28cb2208273a2d5679d6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clk/renesas/r8a7795-cpg-mssr.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c |
| +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c |
| @@ -15,6 +15,7 @@ |
| #include <linux/device.h> |
| #include <linux/init.h> |
| #include <linux/kernel.h> |
| +#include <linux/soc/renesas/rcar-rst.h> |
| |
| #include <dt-bindings/clock/r8a7795-cpg-mssr.h> |
| |
| @@ -311,7 +312,12 @@ static const struct rcar_gen3_cpg_pll_co |
| static int __init r8a7795_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) { |