Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84c9c3c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarDirk Behme <dirk.behme@de.bosch.com>
parent 931db8a0

drivers/clk/renesas/clk-rcar-gen2.c

+25 −0
Original line number Diff line number Diff line
@@ -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 device_node *np, struct rcar_gen2_cpg *cpg, 
						 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_init(struct device_node *np) 
	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__);