| Message ID | 20210901053951.60952-7-samuel@sholland.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | clk: sunxi-ng: Add a RTC CCU driver | expand |
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@sholland.org> > --- > 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
On 9/3/21 9:51 AM, Maxime Ripard wrote: > 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@sholland.org> >> --- >> 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? Right, I could split osc32k_fanout_clk like with rtc_32k_fixed_clk and rtc_32k_mux_clk. Then H6 would use osc32k_fanout_fixed_clk. Regards, Samuel
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); +} +CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_ccu, "allwinner,sun50i-h6-rtc", + sun50i_h6_rtc_ccu_setup); + static void __init sun50i_h616_rtc_ccu_setup(struct device_node *node) { have_iosc_calib = 1; diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index adec1b14a8de..f7cbbf57f112 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -363,23 +363,6 @@ CLK_OF_DECLARE_DRIVER(sun8i_h3_rtc_clk, "allwinner,sun8i-h3-rtc", CLK_OF_DECLARE_DRIVER(sun50i_h5_rtc_clk, "allwinner,sun50i-h5-rtc", sun8i_h3_rtc_clk_init); -static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = { - .rc_osc_rate = 16000000, - .fixed_prescaler = 32, - .has_prescaler = 1, - .has_out_clk = 1, - .export_iosc = 1, - .has_losc_en = 1, - .has_auto_swt = 1, -}; - -static void __init sun50i_h6_rtc_clk_init(struct device_node *node) -{ - sun6i_rtc_clk_init(node, &sun50i_h6_rtc_data); -} -CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc", - sun50i_h6_rtc_clk_init); - /* * The R40 user manual is self-conflicting on whether the prescaler is * fixed or configurable. The clock diagram shows it as fixed, but there
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@sholland.org> --- drivers/clk/sunxi-ng/sun50i-rtc-ccu.c | 49 +++++++++++++++++++++++++++ drivers/rtc/rtc-sun6i.c | 17 ---------- 2 files changed, 49 insertions(+), 17 deletions(-)