lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 3/9] soc: mediatek: Add basic_clk_id to scp_power_data
    Date
    Try to stop extending the clk_id or clk_names if there are
    more and more new BASIC clocks. To get its own clocks by the
    basic_clk_id of each power domain.

    Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
    ---
    drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++--------
    1 file changed, 21 insertions(+), 8 deletions(-)

    diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
    index f669d37..915d635 100644
    --- a/drivers/soc/mediatek/mtk-scpsys.c
    +++ b/drivers/soc/mediatek/mtk-scpsys.c
    @@ -117,6 +117,8 @@ enum clk_id {
    * @sram_pdn_ack_bits: The mask for sram power control acked bits.
    * @bus_prot_mask: The mask for single step bus protection.
    * @clk_id: The basic clocks required by this power domain.
    + * @basic_clk_id: provide the same purpose with field "clk_id"
    + * by declaring basic clock prefix name rather than clk_id.
    * @caps: The flag for active wake-up action.
    */
    struct scp_domain_data {
    @@ -127,6 +129,7 @@ struct scp_domain_data {
    u32 sram_pdn_ack_bits;
    u32 bus_prot_mask;
    enum clk_id clk_id[MAX_CLKS];
    + const char *basic_clk_id[MAX_CLKS];
    u8 caps;
    };

    @@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev,

    scpd->data = data;

    - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) {
    - struct clk *c = clk[data->clk_id[j]];
    + if (data->clk_id[0]) {
    + WARN_ON(data->basic_clk_id[0]);

    - if (IS_ERR(c)) {
    - dev_err(&pdev->dev, "%s: clk unavailable\n",
    - data->name);
    - return ERR_CAST(c);
    - }
    + for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) {
    + struct clk *c = clk[data->clk_id[j]];
    +
    + if (IS_ERR(c)) {
    + dev_err(&pdev->dev,
    + "%s: clk unavailable\n",
    + data->name);
    + return ERR_CAST(c);
    + }

    - scpd->clk[j] = c;
    + scpd->clk[j] = c;
    + }
    + } else if (data->basic_clk_id[0]) {
    + for (j = 0; j < MAX_CLKS &&
    + data->basic_clk_id[j]; j++)
    + scpd->clk[j] = devm_clk_get(&pdev->dev,
    + data->basic_clk_id[j]);
    }

    genpd->name = data->name;
    --
    1.8.1.1.dirty
    \
     
     \ /
      Last update: 2019-12-10 07:48    [W:2.427 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site