Add minimal clock and resets entries required to boot RZ/Five SoC. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx> --- drivers/clk/renesas/r9a07g043-cpg.c | 30 +++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/clk/renesas/r9a07g043-cpg.c b/drivers/clk/renesas/r9a07g043-cpg.c index 27b47ecfe4d8..95ea639490ef 100644 --- a/drivers/clk/renesas/r9a07g043-cpg.c +++ b/drivers/clk/renesas/r9a07g043-cpg.c @@ -151,7 +151,7 @@ static const struct { static const struct { struct rzg2l_mod_clk common[54]; #ifdef CONFIG_RISCV - struct rzg2l_mod_clk rzfive[0]; + struct rzg2l_mod_clk rzfive[2]; #else struct rzg2l_mod_clk rzg2ul[3]; #endif @@ -268,6 +268,10 @@ static const struct { }, #ifdef CONFIG_RISCV .rzfive = { + DEF_MOD("iax45_pclk", R9A07G043_IAX45_PCLK, R9A07G043_CLK_P2, + 0x518, 0), + DEF_MOD("iax45_clk", R9A07G043_IAX45_CLK, R9A07G043_CLK_P1, + 0x518, 1), }, #else .rzg2ul = { @@ -284,7 +288,7 @@ static const struct { static const struct { struct rzg2l_reset common[42]; #ifdef CONFIG_RISCV - struct rzg2l_reset rzfive[0]; + struct rzg2l_reset rzfive[1]; #else struct rzg2l_reset rzg2ul[3]; #endif @@ -335,6 +339,7 @@ static const struct { }, #ifdef CONFIG_RISCV .rzfive = { + DEF_RST(R9A07G043_IAX45_RESETN, 0x818, 0), }, #else .rzg2ul = { @@ -345,16 +350,27 @@ static const struct { #endif }; +#ifdef CONFIG_RISCV +static const unsigned int r9a07g043_crit_mod_clks[] __initconst = { + MOD_CLK_BASE + R9A07G043_IAX45_CLK, + MOD_CLK_BASE + R9A07G043_DMAC_ACLK, +}; +#else static const unsigned int r9a07g043_crit_mod_clks[] __initconst = { MOD_CLK_BASE + R9A07G043_GIC600_GICCLK, MOD_CLK_BASE + R9A07G043_IA55_CLK, MOD_CLK_BASE + R9A07G043_DMAC_ACLK, }; +#endif const struct rzg2l_cpg_info r9a07g043_cpg_info = { /* Core Clocks */ .core_clks = core_clks.common, +#ifdef CONFIG_RISCV + .num_core_clks = ARRAY_SIZE(core_clks.common), +#else .num_core_clks = ARRAY_SIZE(core_clks.common) + ARRAY_SIZE(core_clks.rzg2ul), +#endif .last_dt_core_clk = LAST_DT_CORE_CLK, .num_total_core_clks = MOD_CLK_BASE, @@ -364,10 +380,20 @@ const struct rzg2l_cpg_info r9a07g043_cpg_info = { /* Module Clocks */ .mod_clks = mod_clks.common, +#ifdef CONFIG_RISCV + .num_mod_clks = ARRAY_SIZE(mod_clks.common) + ARRAY_SIZE(mod_clks.rzfive), + .num_hw_mod_clks = R9A07G043_IAX45_PCLK + 1, +#else + .num_mod_clks = ARRAY_SIZE(mod_clks.common) + ARRAY_SIZE(mod_clks.rzg2ul), .num_hw_mod_clks = R9A07G043_TSU_PCLK + 1, +#endif /* Resets */ .resets = resets.common, +#ifdef CONFIG_RISCV + .num_resets = ARRAY_SIZE(resets.common) + ARRAY_SIZE(resets.rzfive), +#else ARRAY_SIZE(resets.common) + ARRAY_SIZE(resets.rzg2ul), +#endif }; -- 2.25.1