Commit bb195306 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

clk: renesas: rcar-gen3-cpg: Add support for RCLK on R-Car H3 ES2.0

Starting with R-Car H3 ES2.0, the parent of RCLK is selected using MD28.

Add support for that, but retain the old behavior for R-Car H3 ES1.x and
M3-W ES1.0 using a quirk.

Inspired by a patch by Takeshi Kihara in the BSP.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Cc: Takeshi Kihara <takeshi.kihara.df@renesas.com>
parent 5573d194
...@@ -252,11 +252,20 @@ static u32 cpg_mode __initdata; ...@@ -252,11 +252,20 @@ static u32 cpg_mode __initdata;
static u32 cpg_quirks __initdata; static u32 cpg_quirks __initdata;
#define PLL_ERRATA BIT(0) /* Missing PLL0/2/4 post-divider */ #define PLL_ERRATA BIT(0) /* Missing PLL0/2/4 post-divider */
#define RCKCR_CKSEL BIT(1) /* Manual RCLK parent selection */
static const struct soc_device_attribute cpg_quirks_match[] __initconst = { static const struct soc_device_attribute cpg_quirks_match[] __initconst = {
{ {
.soc_id = "r8a7795", .revision = "ES1.0", .soc_id = "r8a7795", .revision = "ES1.0",
.data = (void *)PLL_ERRATA, .data = (void *)(PLL_ERRATA | RCKCR_CKSEL),
},
{
.soc_id = "r8a7795", .revision = "ES1.*",
.data = (void *)RCKCR_CKSEL,
},
{
.soc_id = "r8a7796", .revision = "ES1.0",
.data = (void *)RCKCR_CKSEL,
}, },
{ /* sentinel */ } { /* sentinel */ }
}; };
...@@ -330,6 +339,7 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, ...@@ -330,6 +339,7 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
return cpg_sd_clk_register(core, base, __clk_get_name(parent)); return cpg_sd_clk_register(core, base, __clk_get_name(parent));
case CLK_TYPE_GEN3_R: case CLK_TYPE_GEN3_R:
if (cpg_quirks & RCKCR_CKSEL) {
/* /*
* RINT is default. * RINT is default.
* Only if EXTALR is populated, we switch to it. * Only if EXTALR is populated, we switch to it.
...@@ -343,6 +353,12 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, ...@@ -343,6 +353,12 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
writel(value, base + CPG_RCKCR); writel(value, base + CPG_RCKCR);
break; break;
}
/* Select parent clock of RCLK by MD28 */
if (cpg_mode & BIT(28))
parent = clks[cpg_clk_extalr];
break;
default: default:
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment