openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
Geert Uytterhoeven 2017-03-10 11:36:33 +01:00
parent c013fc7d23
commit 5f3a432a44
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/renesas/r8a7795-cpg-mssr.c
View File

@ -330,7 +330,7 @@ static int __init r8a7795_cpg_mssr_init(struct device *dev)
return -EINVAL; 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 = { const struct cpg_mssr_info r8a7795_cpg_mssr_info __initconst = {

2
drivers/clk/renesas/r8a7796-cpg-mssr.c
View File

@ -273,7 +273,7 @@ static int __init r8a7796_cpg_mssr_init(struct device *dev)
return -EINVAL; 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 = { const struct cpg_mssr_info r8a7796_cpg_mssr_info __initconst = {

4
drivers/clk/renesas/rcar-gen3-cpg.c
View File

@ -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 const struct rcar_gen3_cpg_pll_config *cpg_pll_config __initdata;
static unsigned int cpg_clk_extalr __initdata; static unsigned int cpg_clk_extalr __initdata;
static u32 cpg_mode __initdata;
struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info, 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, 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_pll_config = config;
cpg_clk_extalr = clk_extalr; cpg_clk_extalr = clk_extalr;
cpg_mode = mode;
return 0; return 0;
} }

2
drivers/clk/renesas/rcar-gen3-cpg.h
View File

@ -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, const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
struct clk **clks, void __iomem *base); struct clk **clks, void __iomem *base);
int rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config, int rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
unsigned int clk_extalr); unsigned int clk_extalr, u32 mode);
#endif #endif