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

Commit 5f3a432a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

clk: renesas: rcar-gen3-cpg: Pass mode pins to rcar_gen3_cpg_init() 



Pass the mode pin states from the SoC-specific CPG/MSSR driver to the
R-Car Gen3 CPG driver core, as their state will be needed to make some
core clock configuration decisions.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent c013fc7d

drivers/clk/renesas/r8a7795-cpg-mssr.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int __init r8a7795_cpg_mssr_init(struct device *dev) 
		return -EINVAL;

	}



	return rcar_gen3_cpg_init(cpg_pll_config, CLK_EXTALR);

	return rcar_gen3_cpg_init(cpg_pll_config, CLK_EXTALR, cpg_mode);

}



const struct cpg_mssr_info r8a7795_cpg_mssr_info __initconst = {

drivers/clk/renesas/r8a7796-cpg-mssr.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int __init r8a7796_cpg_mssr_init(struct device *dev) 
		return -EINVAL;

	}



	return rcar_gen3_cpg_init(cpg_pll_config, CLK_EXTALR);

	return rcar_gen3_cpg_init(cpg_pll_config, CLK_EXTALR, cpg_mode);

}



const struct cpg_mssr_info r8a7796_cpg_mssr_info __initconst = {

drivers/clk/renesas/rcar-gen3-cpg.c

+3 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static struct clk * __init cpg_sd_clk_register(const struct cpg_core_clk *core, 


static const struct rcar_gen3_cpg_pll_config *cpg_pll_config __initdata;

static unsigned int cpg_clk_extalr __initdata;

static u32 cpg_mode __initdata;



struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,

	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
@@ -334,9 +335,10 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, 
}



int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,

			      unsigned int clk_extalr)

			      unsigned int clk_extalr, u32 mode)

{

	cpg_pll_config = config;

	cpg_clk_extalr = clk_extalr;

	cpg_mode = mode;

	return 0;

}

drivers/clk/renesas/rcar-gen3-cpg.h

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ struct clk *rcar_gen3_cpg_clk_register(struct device *dev, 
	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,

	struct clk **clks, void __iomem *base);

int rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,

		       unsigned int clk_extalr);

		       unsigned int clk_extalr, u32 mode);



#endif