On Wed, Sep 01, 2021 at 12:39:50AM -0500, Samuel Holland wrote:
> H6 has IOSC calibration and an ext-osc32k input.
>
> H6 has the osc32k mux and the rtc-32k mux, but no fanout mux.
>
> Signed-off-by: Samuel Holland <samuel@xxxxxxxxxxxx>
> ---
> drivers/clk/sunxi-ng/sun50i-rtc-ccu.c | 49 +++++++++++++++++++++++++++
> drivers/rtc/rtc-sun6i.c | 17 ----------
> 2 files changed, 49 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/clk/sunxi-ng/sun50i-rtc-ccu.c b/drivers/clk/sunxi-ng/sun50i-rtc-ccu.c
> index 1dfa05c2f0e9..9603dc0d3d7b 100644
> --- a/drivers/clk/sunxi-ng/sun50i-rtc-ccu.c
> +++ b/drivers/clk/sunxi-ng/sun50i-rtc-ccu.c
> @@ -227,6 +227,16 @@ static SUNXI_CCU_MUX_DATA_WITH_GATE(osc32k_fanout_clk, "rtc-32k-fanout",
> static SUNXI_CCU_M_FW_WITH_GATE(rtc_spi_clk, "rtc-spi", "ahb",
> 0x310, 0, 5, BIT(31), 0);
>
> +static struct ccu_common *sun50i_h6_rtc_ccu_clks[] = {
> + &iosc_clk,
> + &iosc_32k_clk,
> + &ext_osc32k_gate_clk.common,
> + &osc32k_clk.common,
> + &osc24M_32k_clk.common,
> + &rtc_32k_mux_clk.common,
> + &osc32k_fanout_clk.common,
> +};
> +
> static struct ccu_common *sun50i_h616_rtc_ccu_clks[] = {
> &iosc_clk,
> &iosc_32k_clk,
> @@ -246,6 +256,21 @@ static struct ccu_common *sun50i_r329_rtc_ccu_clks[] = {
> &rtc_spi_clk.common,
> };
>
> +static struct clk_hw_onecell_data sun50i_h6_rtc_ccu_hw_clks = {
> + .num = CLK_NUMBER,
> + .hws = {
> + [CLK_OSC32K] = &osc32k_clk.common.hw,
> + [CLK_OSC32K_FANOUT] = &osc32k_fanout_clk.common.hw,
> + [CLK_IOSC] = &iosc_clk.hw,
> +
> + [CLK_IOSC_32K] = &iosc_32k_clk.hw,
> + [CLK_EXT_OSC32K_GATE] = &ext_osc32k_gate_clk.common.hw,
> + [CLK_OSC24M_32K] = &osc24M_32k_clk.common.hw,
> + [CLK_RTC_32K] = &rtc_32k_mux_clk.common.hw,
> + [CLK_RTC_SPI] = NULL,
> + },
> +};
> +
> static struct clk_hw_onecell_data sun50i_h616_rtc_ccu_hw_clks = {
> .num = CLK_NUMBER,
> .hws = {
> @@ -276,6 +301,13 @@ static struct clk_hw_onecell_data sun50i_r329_rtc_ccu_hw_clks = {
> },
> };
>
> +static const struct sunxi_ccu_desc sun50i_h6_rtc_ccu_desc = {
> + .ccu_clks = sun50i_h6_rtc_ccu_clks,
> + .num_ccu_clks = ARRAY_SIZE(sun50i_h6_rtc_ccu_clks),
> +
> + .hw_clks = &sun50i_h6_rtc_ccu_hw_clks,
> +};
> +
> static const struct sunxi_ccu_desc sun50i_h616_rtc_ccu_desc = {
> .ccu_clks = sun50i_h616_rtc_ccu_clks,
> .num_ccu_clks = ARRAY_SIZE(sun50i_h616_rtc_ccu_clks),
> @@ -318,6 +350,23 @@ static void __init sunxi_rtc_ccu_init(struct device_node *node,
> of_sunxi_ccu_probe(node, reg, desc);
> }
>
> +static void __init sun50i_h6_rtc_ccu_setup(struct device_node *node)
> +{
> + struct clk_init_data *init;
> +
> + have_iosc_calib = 1;
> +
> + /* Casting away the const from a pointer to a non-const anonymous object... */
> + init = (struct clk_init_data *)osc32k_fanout_clk.common.hw.init;
> +
> + /* Fanout only has one parent: osc32k. */
> + init->num_parents = 1;
> +
> + sunxi_rtc_ccu_init(node, &sun50i_h6_rtc_ccu_desc);
> +}
Indeed, that's not great.
Maybe we should just duplicate the sun50i_h6_rtc_ccu_desc (and
osc32k_fanout_clk) to cover both cases?
Maxime
Attachment:
signature.asc
Description: PGP signature
