| From 512b2778e9d7c63e74c17073b11a1beb905e0a8f Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 7 Jul 2015 14:57:37 +0200 |
| Subject: [PATCH 181/299] clk: renesas: rcar-gen2: Obtain mode pin values using |
| 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. |
| |
| Fall back to our own private copy of rcar_gen2_read_mode_pins() for |
| backward-compatibility with old DTs. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Dirk Behme <dirk.behme@de.bosch.com> |
| (cherry picked from commit f84c9c3ca9770bd847cb361d67bd385499a20d37) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clk/renesas/clk-rcar-gen2.c | 25 +++++++++++++++++++++++++ |
| 1 file changed, 25 insertions(+) |
| |
| --- a/drivers/clk/renesas/clk-rcar-gen2.c |
| +++ b/drivers/clk/renesas/clk-rcar-gen2.c |
| @@ -19,6 +19,7 @@ |
| #include <linux/of_address.h> |
| #include <linux/slab.h> |
| #include <linux/spinlock.h> |
| +#include <linux/soc/renesas/rcar-rst.h> |
| |
| struct rcar_gen2_cpg { |
| struct clk_onecell_data data; |
| @@ -364,6 +365,23 @@ rcar_gen2_cpg_register_clock(struct devi |
| 4, 0, table, &cpg->lock); |
| } |
| |
| +/* |
| + * Reset register definitions. |
| + */ |
| +#define MODEMR 0xe6160060 |
| + |
| +static u32 __init rcar_gen2_read_mode_pins(void) |
| +{ |
| + void __iomem *modemr = ioremap_nocache(MODEMR, 4); |
| + u32 mode; |
| + |
| + BUG_ON(!modemr); |
| + mode = ioread32(modemr); |
| + iounmap(modemr); |
| + |
| + return mode; |
| +} |
| + |
| static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) |
| { |
| const struct cpg_pll_config *config; |
| @@ -372,6 +390,13 @@ static void __init rcar_gen2_cpg_clocks_ |
| unsigned int i; |
| int num_clks; |
| |
| + if (rcar_rst_read_mode_pins(&cpg_mode)) { |
| + /* Backward-compatibility with old DT */ |
| + pr_warn("%s: failed to obtain mode pins from RST\n", |
| + np->full_name); |
| + cpg_mode = rcar_gen2_read_mode_pins(); |
| + } |
| + |
| num_clks = of_property_count_strings(np, "clock-output-names"); |
| if (num_clks < 0) { |
| pr_err("%s: failed to count clocks\n", __func__); |