lkml.org 
[lkml]   [2021]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 8/9] [DO NOT MERGE] clk: sunxi-ng: sun6i-rtc: Add support for H6
    Date
    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>
    ---
    Changes since v1:
    - Rebase.
    - Add a new non-mux "osc32k-fanout" clock instead of changing the
    number of parents in osc32k_fanout_clk.

    drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 49 ++++++++++++++++++++++++++++
    drivers/rtc/rtc-sun6i.c | 17 ----------
    2 files changed, 49 insertions(+), 17 deletions(-)

    diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
    index 7e67466c481d..f742f6569f6c 100644
    --- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
    +++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
    @@ -234,9 +234,22 @@ static SUNXI_CCU_MUX_DATA_WITH_GATE(osc32k_fanout_clk, "osc32k-fanout",
    osc32k_fanout_parents,
    0x60, 1, 2, BIT(0), 0);

    +static SUNXI_CCU_GATE_HW(osc32k_fanout_gate_clk, "osc32k-fanout",
    + &osc32k_clk.common.hw, 0x60, BIT(0), 0);
    +
    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_gate_clk.common,
    +};
    +
    static struct ccu_common *sun50i_h616_rtc_ccu_clks[] = {
    &iosc_clk,
    &iosc_32k_clk,
    @@ -256,6 +269,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_gate_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 = {
    @@ -286,6 +314,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),
    @@ -300,6 +335,11 @@ static const struct sunxi_ccu_desc sun50i_r329_rtc_ccu_desc = {
    .hw_clks = &sun50i_r329_rtc_ccu_hw_clks,
    };

    +static void sun50i_h6_rtc_ccu_setup(void)
    +{
    + have_iosc_calib = 1;
    +}
    +
    static void sun50i_h616_rtc_ccu_setup(void)
    {
    have_iosc_calib = 1;
    @@ -317,6 +357,11 @@ static void sun50i_r329_rtc_ccu_setup(void)
    };
    }

    +static const struct sun6i_rtc_match_data sun50i_h6_rtc_ccu_data = {
    + .desc = &sun50i_h6_rtc_ccu_desc,
    + .setup = sun50i_h6_rtc_ccu_setup,
    +};
    +
    static const struct sun6i_rtc_match_data sun50i_h616_rtc_ccu_data = {
    .desc = &sun50i_h616_rtc_ccu_desc,
    .setup = sun50i_h616_rtc_ccu_setup,
    @@ -328,6 +373,10 @@ static const struct sun6i_rtc_match_data sun50i_r329_rtc_ccu_data = {
    };

    static const struct of_device_id sun6i_rtc_ccu_match[] = {
    + {
    + .compatible = "allwinner,sun50i-h6-rtc",
    + .data = &sun50i_h6_rtc_ccu_data,
    + },
    {
    .compatible = "allwinner,sun50i-h616-rtc",
    .data = &sun50i_h616_rtc_ccu_data,
    diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
    index 079c7c8f3b54..727b34a6e44d 100644
    --- a/drivers/rtc/rtc-sun6i.c
    +++ b/drivers/rtc/rtc-sun6i.c
    @@ -364,23 +364,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
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-09-28 10:05    [W:2.933 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site