From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3907C77B7E for ; Thu, 1 Jun 2023 10:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231969AbjFAKIn (ORCPT ); Thu, 1 Jun 2023 06:08:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232323AbjFAKI0 (ORCPT ); Thu, 1 Jun 2023 06:08:26 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A8DA2110 for ; Thu, 1 Jun 2023 03:06:18 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2af177f12a5so7858381fa.2 for ; Thu, 01 Jun 2023 03:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685613976; x=1688205976; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=uUPzqwpmOHWvYnjzKTggnaFdmUJfWg2aXQtGKcALHG0=; b=akcI+69UnyHfsIk3pFxKsfA8vWIkPdO00VpTMZomtV4FsqZO5HlY90O23m1C7ygVyK zj5B50AkpPy3ZiAa3+t+MRgF2cNJ7LaF6xEdXmhMZlsts0TFIz2wfyJdRHrrBtzjRVCZ PUHDTFZReqE6d5LQuuV7xJuzIfm1P5qEEucIJ3TwJHModElRgXNuL95jdJ5NRnhi1WPm 4ZsT0XgytQcAhg1bBTBPtxNhm9It6cE2fxWV0zJkMyt1ZAFmOIokJLS+qrMrIxNAnOEX rFu+oGl96XxVhJGtQbSOf3wd5f+I/Z9TgA0fY3Z12zR0R5B9YNH9Aud9PrE4gBucVVXX Fdbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685613976; x=1688205976; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uUPzqwpmOHWvYnjzKTggnaFdmUJfWg2aXQtGKcALHG0=; b=fBOa/OZw8G6L6AUGOmTkT3JLi4FqGMZU7S2E9AVAXMNn/J/wQ75B7B7bSrsIW+wYN4 9kckuHLXDN0C/ypjX1EMEkbY4b6seqPeInkpHPbDQiyBqQRh1kb1Ha2J0d1xQrtyUL7k hyoI8dyMODPFxCpyRhoIN50r3OKnRYgsZwjYoAfbYnEPbIPOxuEcIbX6sJdQPbuuPDcS oPpddAUm1X8K8LU/H4HV0iEW2QIdhGc4C9CnQDPdxeuLH6jVxxX7jsS9y37oanGC7HId 9BQPpyw8JJmJ1AouNJaM+hCoRrkXcKFAb24b9r7AmF29OmrrHsZOPIwasVy+JIwdnxTJ LsDA== X-Gm-Message-State: AC+VfDzu+VI5M/ZGcHpg/0UJy+QpNDUrptD8O1cVhFxnLIM5cIbHBoOM q3plgp9XojPCVWu50mzmwXd9eA== X-Google-Smtp-Source: ACHHUZ5UfnBRVlzGjhmjsK7mNTwQuecddznpYaGh1oQ3ixEnB10Hc76lvkL5GFYiqXYbuIDTVnpEZQ== X-Received: by 2002:a2e:a305:0:b0:2ad:d949:dd39 with SMTP id l5-20020a2ea305000000b002add949dd39mr4248842lje.29.1685613976254; Thu, 01 Jun 2023 03:06:16 -0700 (PDT) Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77]) by smtp.gmail.com with ESMTPSA id w21-20020a2e9bd5000000b002ac7978f0a6sm3577228ljj.100.2023.06.01.03.06.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Jun 2023 03:06:15 -0700 (PDT) Message-ID: <291cf790-1356-cdc1-86c7-e13abb5ed455@linaro.org> Date: Thu, 1 Jun 2023 12:06:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Subject: Re: [PATCH 03/20] clk: qcom: smd-rpm: Separate out interconnect bus clocks Content-Language: en-US To: Dmitry Baryshkov , Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Georgi Djakov , Leo Yan , Evan Green Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org References: <20230526-topic-smd_icc-v1-0-1bf8e6663c4e@linaro.org> <20230526-topic-smd_icc-v1-3-1bf8e6663c4e@linaro.org> <0804c404-52a7-a8c2-372b-c6493736a860@linaro.org> From: Konrad Dybcio In-Reply-To: <0804c404-52a7-a8c2-372b-c6493736a860@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 1.06.2023 12:03, Dmitry Baryshkov wrote: > On 30/05/2023 13:20, Konrad Dybcio wrote: >> The interconnect bus clocks are now handled within the ICC framework. > > now = since commit ?? > Or should this commit be moved closer the end of the series? Right, this should have been a bit later in the queue, possibly right after "Control bus icc from icc". Konrad > >> They still however need to get a kickstart *before* we call >> clk_smd_rpm_enable_scaling(), or RPM will assume that they should all >> be running at 0 kHz and the system will inevitably die. >> >> Separate them out to ensure such a kickstart can still take place. >> >> As a happy accident, the file got smaller: >> >> Total: Before=41951, After=41555, chg -0.94% >> >> Signed-off-by: Konrad Dybcio >> --- >>   drivers/clk/qcom/clk-smd-rpm.c | 278 +++++++++++++++++------------------------ >>   1 file changed, 115 insertions(+), 163 deletions(-) >> >> diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c >> index 937cb1515968..b63f946e4520 100644 >> --- a/drivers/clk/qcom/clk-smd-rpm.c >> +++ b/drivers/clk/qcom/clk-smd-rpm.c >> @@ -167,6 +167,14 @@ struct clk_smd_rpm { >>   struct rpm_smd_clk_desc { >>       struct clk_smd_rpm **clks; >>       size_t num_clks; >> + >> +    /* >> +     * Interconnect clocks are managed by the icc framework, this driver >> +     * only kickstarts them so that they don't get gated between >> +     * clk_smd_rpm_enable_scaling() and interconnect driver initialization. >> +     */ >> +    struct clk_smd_rpm **icc_clks; >> +    size_t num_icc_clks; >>       bool scaling_before_handover; >>   }; >>   @@ -498,13 +506,69 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER(div_clk1, 11, 19200000); >>   DEFINE_CLK_SMD_RPM_XO_BUFFER(div_clk2, 12, 19200000); >>   DEFINE_CLK_SMD_RPM_XO_BUFFER(div_clk3, 13, 19200000); >>   +static struct clk_smd_rpm *bimc_pcnoc_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_0_pcnoc_clk, >> +}; >> + >> +static struct clk_smd_rpm *bimc_pcnoc_snoc_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_0_pcnoc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +}; >> + >> +static struct clk_smd_rpm *bimc_pcnoc_snoc_smmnoc_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_0_pcnoc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +    &clk_smd_rpm_bus_2_sysmmnoc_clk, >> +}; >> + >> +static struct clk_smd_rpm *bimc_pcnoc_snoc_cnoc_ocmem_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_0_pcnoc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +    &clk_smd_rpm_bus_2_cnoc_clk, >> +    &clk_smd_rpm_ocmemgx_clk, >> +}; >> + >> +static struct clk_smd_rpm *msm8996_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_branch_aggre1_noc_clk, >> +    &clk_smd_rpm_branch_aggre2_noc_clk, >> +    &clk_smd_rpm_bus_0_pcnoc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +    &clk_smd_rpm_bus_2_cnoc_clk, >> +    &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> +}; >> + >> +static struct clk_smd_rpm *msm8998_icc_clks[] = { >> +    &clk_smd_rpm_aggre1_noc_clk, >> +    &clk_smd_rpm_aggre2_noc_clk, >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +    &clk_smd_rpm_bus_2_cnoc_clk, >> +    &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> +}; >> + >> +static struct clk_smd_rpm *sdm660_icc_clks[] = { >> +    &clk_smd_rpm_aggre2_noc_clk, >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_1_snoc_clk, >> +    &clk_smd_rpm_bus_2_cnoc_clk, >> +    &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> +}; >> + >> +static struct clk_smd_rpm *sm_qnoc_icc_clks[] = { >> +    &clk_smd_rpm_bimc_clk, >> +    &clk_smd_rpm_bus_1_cnoc_clk, >> +    &clk_smd_rpm_mmnrt_clk, >> +    &clk_smd_rpm_mmrt_clk, >> +    &clk_smd_rpm_qup_clk, >> +    &clk_smd_rpm_bus_2_snoc_clk, >> +}; >> + >>   static struct clk_smd_rpm *msm8909_clks[] = { >> -    [RPM_SMD_PCNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QPIC_CLK]        = &clk_smd_rpm_qpic_clk, >>       [RPM_SMD_QPIC_CLK_A]        = &clk_smd_rpm_qpic_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >> @@ -530,15 +594,11 @@ static struct clk_smd_rpm *msm8909_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8909 = { >>       .clks = msm8909_clks, >>       .num_clks = ARRAY_SIZE(msm8909_clks), >> +    .icc_clks = bimc_pcnoc_snoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8916_clks[] = { >> -    [RPM_SMD_PCNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK]        = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1]        = &clk_smd_rpm_bb_clk1, >> @@ -562,21 +622,15 @@ static struct clk_smd_rpm *msm8916_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8916 = { >>       .clks = msm8916_clks, >>       .num_clks = ARRAY_SIZE(msm8916_clks), >> +    .icc_clks = bimc_pcnoc_snoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8917_clks[] = { >>       [RPM_SMD_XO_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_BIMC_GPU_CLK]        = &clk_smd_rpm_bimc_gpu_clk, >>       [RPM_SMD_BIMC_GPU_A_CLK]    = &clk_smd_rpm_bimc_gpu_a_clk, >> -    [RPM_SMD_SYSMMNOC_CLK]        = &clk_smd_rpm_bus_2_sysmmnoc_clk, >> -    [RPM_SMD_SYSMMNOC_A_CLK]    = &clk_smd_rpm_bus_2_sysmmnoc_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK]        = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1]        = &clk_smd_rpm_bb_clk1, >> @@ -596,19 +650,13 @@ static struct clk_smd_rpm *msm8917_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8917 = { >>       .clks = msm8917_clks, >>       .num_clks = ARRAY_SIZE(msm8917_clks), >> +    .icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8936_clks[] = { >>       [RPM_SMD_XO_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PCNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_SYSMMNOC_CLK]        = &clk_smd_rpm_bus_2_sysmmnoc_clk, >> -    [RPM_SMD_SYSMMNOC_A_CLK]    = &clk_smd_rpm_bus_2_sysmmnoc_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK]        = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1]        = &clk_smd_rpm_bb_clk1, >> @@ -632,25 +680,17 @@ static struct clk_smd_rpm *msm8936_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8936 = { >>           .clks = msm8936_clks, >>           .num_clks = ARRAY_SIZE(msm8936_clks), >> +        .icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks, >> +        .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8974_clks[] = { >>       [RPM_SMD_XO_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_CNOC_CLK]        = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK]        = &clk_smd_rpm_bus_2_cnoc_a_clk, >>       [RPM_SMD_MMSSNOC_AHB_CLK]    = &clk_smd_rpm_bus_3_mmssnoc_ahb_clk, >>       [RPM_SMD_MMSSNOC_AHB_A_CLK]    = &clk_smd_rpm_bus_3_mmssnoc_ahb_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >>       [RPM_SMD_GFX3D_CLK_SRC]        = &clk_smd_rpm_gfx3d_clk_src, >>       [RPM_SMD_GFX3D_A_CLK_SRC]    = &clk_smd_rpm_gfx3d_a_clk_src, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_OCMEMGX_CLK]        = &clk_smd_rpm_ocmemgx_clk, >> -    [RPM_SMD_OCMEMGX_A_CLK]        = &clk_smd_rpm_ocmemgx_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK]        = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_CXO_D0]        = &clk_smd_rpm_cxo_d0, >> @@ -684,20 +724,14 @@ static struct clk_smd_rpm *msm8974_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8974 = { >>       .clks = msm8974_clks, >>       .num_clks = ARRAY_SIZE(msm8974_clks), >> +    .icc_clks = bimc_pcnoc_snoc_cnoc_ocmem_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_cnoc_ocmem_icc_clks), >>       .scaling_before_handover = true, >>   }; >>     static struct clk_smd_rpm *msm8976_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PCNOC_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_SYSMMNOC_CLK]    = &clk_smd_rpm_bus_2_sysmmnoc_clk, >> -    [RPM_SMD_SYSMMNOC_A_CLK] = &clk_smd_rpm_bus_2_sysmmnoc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1] = &clk_smd_rpm_bb_clk1, >> @@ -718,24 +752,15 @@ static struct clk_smd_rpm *msm8976_clks[] = { >>     static const struct rpm_smd_clk_desc rpm_clk_msm8976 = { >>       .clks = msm8976_clks, >> -    .num_clks = ARRAY_SIZE(msm8976_clks), >> +    .icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8992_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PNOC_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PNOC_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_OCMEMGX_CLK] = &clk_smd_rpm_ocmemgx_clk, >> -    [RPM_SMD_OCMEMGX_A_CLK] = &clk_smd_rpm_ocmemgx_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_2_cnoc_a_clk, >>       [RPM_SMD_GFX3D_CLK_SRC] = &clk_smd_rpm_gfx3d_clk_src, >>       [RPM_SMD_GFX3D_A_CLK_SRC] = &clk_smd_rpm_gfx3d_a_clk_src, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >>       [RPM_SMD_BB_CLK1] = &clk_smd_rpm_bb_clk1, >>       [RPM_SMD_BB_CLK1_A] = &clk_smd_rpm_bb_clk1_a, >>       [RPM_SMD_BB_CLK1_PIN] = &clk_smd_rpm_bb_clk1_pin, >> @@ -777,23 +802,15 @@ static struct clk_smd_rpm *msm8992_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8992 = { >>       .clks = msm8992_clks, >>       .num_clks = ARRAY_SIZE(msm8992_clks), >> +    .icc_clks = bimc_pcnoc_snoc_cnoc_ocmem_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_cnoc_ocmem_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8994_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PNOC_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PNOC_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_OCMEMGX_CLK] = &clk_smd_rpm_ocmemgx_clk, >> -    [RPM_SMD_OCMEMGX_A_CLK] = &clk_smd_rpm_ocmemgx_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_2_cnoc_a_clk, >>       [RPM_SMD_GFX3D_CLK_SRC] = &clk_smd_rpm_gfx3d_clk_src, >>       [RPM_SMD_GFX3D_A_CLK_SRC] = &clk_smd_rpm_gfx3d_a_clk_src, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >>       [RPM_SMD_BB_CLK1] = &clk_smd_rpm_bb_clk1, >>       [RPM_SMD_BB_CLK1_A] = &clk_smd_rpm_bb_clk1_a, >>       [RPM_SMD_BB_CLK1_PIN] = &clk_smd_rpm_bb_clk1_pin, >> @@ -837,29 +854,17 @@ static struct clk_smd_rpm *msm8994_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8994 = { >>       .clks = msm8994_clks, >>       .num_clks = ARRAY_SIZE(msm8994_clks), >> +    .icc_clks = bimc_pcnoc_snoc_cnoc_ocmem_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_cnoc_ocmem_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8996_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PCNOC_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_2_cnoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_MMAXI_CLK] = &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> -    [RPM_SMD_MMAXI_A_CLK] = &clk_smd_rpm_mmssnoc_axi_rpm_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >>       [RPM_SMD_CE1_CLK] = &clk_smd_rpm_ce1_clk, >>       [RPM_SMD_CE1_A_CLK] = &clk_smd_rpm_ce1_a_clk, >> -    [RPM_SMD_AGGR1_NOC_CLK] = &clk_smd_rpm_branch_aggre1_noc_clk, >> -    [RPM_SMD_AGGR1_NOC_A_CLK] = &clk_smd_rpm_branch_aggre1_noc_a_clk, >> -    [RPM_SMD_AGGR2_NOC_CLK] = &clk_smd_rpm_branch_aggre2_noc_clk, >> -    [RPM_SMD_AGGR2_NOC_A_CLK] = &clk_smd_rpm_branch_aggre2_noc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1] = &clk_smd_rpm_bb_clk1, >> @@ -891,6 +896,8 @@ static struct clk_smd_rpm *msm8996_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8996 = { >>       .clks = msm8996_clks, >>       .num_clks = ARRAY_SIZE(msm8996_clks), >> +    .icc_clks = msm8996_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(msm8996_icc_clks), >>   }; >>     static struct clk_smd_rpm *qcs404_clks[] = { >> @@ -919,19 +926,15 @@ static struct clk_smd_rpm *qcs404_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_qcs404 = { >>       .clks = qcs404_clks, >>       .num_clks = ARRAY_SIZE(qcs404_clks), >> +    .icc_clks = bimc_pcnoc_snoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8998_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_PCNOC_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >>       [RPM_SMD_PCNOC_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_2_cnoc_a_clk, >>       [RPM_SMD_CE1_CLK] = &clk_smd_rpm_ce1_clk, >>       [RPM_SMD_CE1_A_CLK] = &clk_smd_rpm_ce1_a_clk, >>       [RPM_SMD_DIV_CLK1] = &clk_smd_rpm_div_clk1, >> @@ -954,12 +957,6 @@ static struct clk_smd_rpm *msm8998_clks[] = { >>       [RPM_SMD_LN_BB_CLK2_A_PIN] = &clk_smd_rpm_ln_bb_clk2_a_pin, >>       [RPM_SMD_LN_BB_CLK3_PIN] = &clk_smd_rpm_ln_bb_clk3_pin, >>       [RPM_SMD_LN_BB_CLK3_A_PIN] = &clk_smd_rpm_ln_bb_clk3_a_pin, >> -    [RPM_SMD_MMAXI_CLK] = &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> -    [RPM_SMD_MMAXI_A_CLK] = &clk_smd_rpm_mmssnoc_axi_rpm_a_clk, >> -    [RPM_SMD_AGGR1_NOC_CLK] = &clk_smd_rpm_aggre1_noc_clk, >> -    [RPM_SMD_AGGR1_NOC_A_CLK] = &clk_smd_rpm_aggre1_noc_a_clk, >> -    [RPM_SMD_AGGR2_NOC_CLK] = &clk_smd_rpm_aggre2_noc_clk, >> -    [RPM_SMD_AGGR2_NOC_A_CLK] = &clk_smd_rpm_aggre2_noc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_RF_CLK1] = &clk_smd_rpm_rf_clk1, >> @@ -979,27 +976,19 @@ static struct clk_smd_rpm *msm8998_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8998 = { >>       .clks = msm8998_clks, >>       .num_clks = ARRAY_SIZE(msm8998_clks), >> +    .icc_clks = msm8998_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(msm8998_icc_clks), >>   }; >>     static struct clk_smd_rpm *sdm660_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_2_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_2_cnoc_a_clk, >>       [RPM_SMD_CNOC_PERIPH_CLK] = &clk_smd_rpm_bus_0_pcnoc_clk, >>       [RPM_SMD_CNOC_PERIPH_A_CLK] = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >> -    [RPM_SMD_MMSSNOC_AXI_CLK] = &clk_smd_rpm_mmssnoc_axi_rpm_clk, >> -    [RPM_SMD_MMSSNOC_AXI_CLK_A] = &clk_smd_rpm_mmssnoc_axi_rpm_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >>       [RPM_SMD_CE1_CLK] = &clk_smd_rpm_ce1_clk, >>       [RPM_SMD_CE1_A_CLK] = &clk_smd_rpm_ce1_a_clk, >> -    [RPM_SMD_AGGR2_NOC_CLK] = &clk_smd_rpm_aggre2_noc_clk, >> -    [RPM_SMD_AGGR2_NOC_A_CLK] = &clk_smd_rpm_aggre2_noc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_RF_CLK1] = &clk_smd_rpm_rf_clk1, >> @@ -1025,15 +1014,13 @@ static struct clk_smd_rpm *sdm660_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_sdm660 = { >>       .clks = sdm660_clks, >>       .num_clks = ARRAY_SIZE(sdm660_clks), >> +    .icc_clks = sdm660_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(sdm660_icc_clks), >>   }; >>     static struct clk_smd_rpm *mdm9607_clks[] = { >>       [RPM_SMD_XO_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PCNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QPIC_CLK]        = &clk_smd_rpm_qpic_clk, >>       [RPM_SMD_QPIC_CLK_A]        = &clk_smd_rpm_qpic_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >> @@ -1047,21 +1034,15 @@ static struct clk_smd_rpm *mdm9607_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_mdm9607 = { >>       .clks = mdm9607_clks, >>       .num_clks = ARRAY_SIZE(mdm9607_clks), >> +    .icc_clks = bimc_pcnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *msm8953_clks[] = { >>       [RPM_SMD_XO_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC]        = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_PCNOC_CLK]        = &clk_smd_rpm_bus_0_pcnoc_clk, >> -    [RPM_SMD_PCNOC_A_CLK]        = &clk_smd_rpm_bus_0_pcnoc_a_clk, >> -    [RPM_SMD_SNOC_CLK]        = &clk_smd_rpm_bus_1_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK]        = &clk_smd_rpm_bus_1_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK]        = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK]        = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_IPA_CLK]        = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK]        = &clk_smd_rpm_ipa_a_clk, >> -    [RPM_SMD_SYSMMNOC_CLK]        = &clk_smd_rpm_bus_2_sysmmnoc_clk, >> -    [RPM_SMD_SYSMMNOC_A_CLK]    = &clk_smd_rpm_bus_2_sysmmnoc_a_clk, >>       [RPM_SMD_QDSS_CLK]        = &clk_smd_rpm_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK]        = &clk_smd_rpm_qdss_a_clk, >>       [RPM_SMD_BB_CLK1]        = &clk_smd_rpm_bb_clk1, >> @@ -1083,23 +1064,19 @@ static struct clk_smd_rpm *msm8953_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_msm8953 = { >>       .clks = msm8953_clks, >>       .num_clks = ARRAY_SIZE(msm8953_clks), >> +    .icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks), >>   }; >>     static struct clk_smd_rpm *sm6125_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_2_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_2_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_branch_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_branch_qdss_a_clk, >>       [RPM_SMD_RF_CLK1] = &clk_smd_rpm_rf_clk1, >>       [RPM_SMD_RF_CLK1_A] = &clk_smd_rpm_rf_clk1_a, >>       [RPM_SMD_RF_CLK2] = &clk_smd_rpm_rf_clk2, >>       [RPM_SMD_RF_CLK2_A] = &clk_smd_rpm_rf_clk2_a, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_1_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_1_cnoc_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >>       [RPM_SMD_CE1_CLK] = &clk_smd_rpm_ce1_clk, >> @@ -1110,12 +1087,6 @@ static struct clk_smd_rpm *sm6125_clks[] = { >>       [RPM_SMD_LN_BB_CLK2_A] = &clk_smd_rpm_ln_bb_clk2_a, >>       [RPM_SMD_LN_BB_CLK3] = &clk_smd_rpm_ln_bb_clk3, >>       [RPM_SMD_LN_BB_CLK3_A] = &clk_smd_rpm_ln_bb_clk3_a, >> -    [RPM_SMD_QUP_CLK] = &clk_smd_rpm_qup_clk, >> -    [RPM_SMD_QUP_A_CLK] = &clk_smd_rpm_qup_a_clk, >> -    [RPM_SMD_MMRT_CLK] = &clk_smd_rpm_mmrt_clk, >> -    [RPM_SMD_MMRT_A_CLK] = &clk_smd_rpm_mmrt_a_clk, >> -    [RPM_SMD_MMNRT_CLK] = &clk_smd_rpm_mmnrt_clk, >> -    [RPM_SMD_MMNRT_A_CLK] = &clk_smd_rpm_mmnrt_a_clk, >>       [RPM_SMD_SNOC_PERIPH_CLK] = &clk_smd_rpm_bus_0_snoc_periph_clk, >>       [RPM_SMD_SNOC_PERIPH_A_CLK] = &clk_smd_rpm_bus_0_snoc_periph_a_clk, >>       [RPM_SMD_SNOC_LPASS_CLK] = &clk_smd_rpm_bus_5_snoc_lpass_clk, >> @@ -1125,34 +1096,24 @@ static struct clk_smd_rpm *sm6125_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_sm6125 = { >>       .clks = sm6125_clks, >>       .num_clks = ARRAY_SIZE(sm6125_clks), >> +    .icc_clks = sm_qnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks) >>   }; >>     /* SM6115 */ >>   static struct clk_smd_rpm *sm6115_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_2_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_2_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_branch_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_branch_qdss_a_clk, >>       [RPM_SMD_RF_CLK1] = &clk_smd_rpm_rf_clk1, >>       [RPM_SMD_RF_CLK1_A] = &clk_smd_rpm_rf_clk1_a, >>       [RPM_SMD_RF_CLK2] = &clk_smd_rpm_rf_clk2, >>       [RPM_SMD_RF_CLK2_A] = &clk_smd_rpm_rf_clk2_a, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_1_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_1_cnoc_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >>       [RPM_SMD_CE1_CLK] = &clk_smd_rpm_ce1_clk, >>       [RPM_SMD_CE1_A_CLK] = &clk_smd_rpm_ce1_a_clk, >> -    [RPM_SMD_QUP_CLK] = &clk_smd_rpm_qup_clk, >> -    [RPM_SMD_QUP_A_CLK] = &clk_smd_rpm_qup_a_clk, >> -    [RPM_SMD_MMRT_CLK] = &clk_smd_rpm_mmrt_clk, >> -    [RPM_SMD_MMRT_A_CLK] = &clk_smd_rpm_mmrt_a_clk, >> -    [RPM_SMD_MMNRT_CLK] = &clk_smd_rpm_mmnrt_clk, >> -    [RPM_SMD_MMNRT_A_CLK] = &clk_smd_rpm_mmnrt_a_clk, >>       [RPM_SMD_SNOC_PERIPH_CLK] = &clk_smd_rpm_bus_0_snoc_periph_clk, >>       [RPM_SMD_SNOC_PERIPH_A_CLK] = &clk_smd_rpm_bus_0_snoc_periph_a_clk, >>       [RPM_SMD_SNOC_LPASS_CLK] = &clk_smd_rpm_bus_5_snoc_lpass_clk, >> @@ -1166,27 +1127,17 @@ static struct clk_smd_rpm *sm6115_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_sm6115 = { >>       .clks = sm6115_clks, >>       .num_clks = ARRAY_SIZE(sm6115_clks), >> +    .icc_clks = sm_qnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks) >>   }; >>     static struct clk_smd_rpm *sm6375_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_2_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_2_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_branch_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_branch_qdss_a_clk, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_1_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_1_cnoc_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >> -    [RPM_SMD_QUP_CLK] = &clk_smd_rpm_qup_clk, >> -    [RPM_SMD_QUP_A_CLK] = &clk_smd_rpm_qup_a_clk, >> -    [RPM_SMD_MMRT_CLK] = &clk_smd_rpm_mmrt_clk, >> -    [RPM_SMD_MMRT_A_CLK] = &clk_smd_rpm_mmrt_a_clk, >> -    [RPM_SMD_MMNRT_CLK] = &clk_smd_rpm_mmnrt_clk, >> -    [RPM_SMD_MMNRT_A_CLK] = &clk_smd_rpm_mmnrt_a_clk, >>       [RPM_SMD_SNOC_PERIPH_CLK] = &clk_smd_rpm_bus_0_snoc_periph_clk, >>       [RPM_SMD_SNOC_PERIPH_A_CLK] = &clk_smd_rpm_bus_0_snoc_periph_a_clk, >>       [RPM_SMD_SNOC_LPASS_CLK] = &clk_smd_rpm_bus_5_snoc_lpass_clk, >> @@ -1203,31 +1154,21 @@ static struct clk_smd_rpm *sm6375_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_sm6375 = { >>       .clks = sm6375_clks, >>       .num_clks = ARRAY_SIZE(sm6375_clks), >> +    .icc_clks = sm_qnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks) >>   }; >>     static struct clk_smd_rpm *qcm2290_clks[] = { >>       [RPM_SMD_XO_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo, >>       [RPM_SMD_XO_A_CLK_SRC] = &clk_smd_rpm_branch_bi_tcxo_a, >> -    [RPM_SMD_SNOC_CLK] = &clk_smd_rpm_bus_2_snoc_clk, >> -    [RPM_SMD_SNOC_A_CLK] = &clk_smd_rpm_bus_2_snoc_a_clk, >> -    [RPM_SMD_BIMC_CLK] = &clk_smd_rpm_bimc_clk, >> -    [RPM_SMD_BIMC_A_CLK] = &clk_smd_rpm_bimc_a_clk, >>       [RPM_SMD_QDSS_CLK] = &clk_smd_rpm_branch_qdss_clk, >>       [RPM_SMD_QDSS_A_CLK] = &clk_smd_rpm_branch_qdss_a_clk, >>       [RPM_SMD_LN_BB_CLK2] = &clk_smd_rpm_ln_bb_clk2, >>       [RPM_SMD_LN_BB_CLK2_A] = &clk_smd_rpm_ln_bb_clk2_a, >>       [RPM_SMD_RF_CLK3] = &clk_smd_rpm_38m4_rf_clk3, >>       [RPM_SMD_RF_CLK3_A] = &clk_smd_rpm_38m4_rf_clk3_a, >> -    [RPM_SMD_CNOC_CLK] = &clk_smd_rpm_bus_1_cnoc_clk, >> -    [RPM_SMD_CNOC_A_CLK] = &clk_smd_rpm_bus_1_cnoc_a_clk, >>       [RPM_SMD_IPA_CLK] = &clk_smd_rpm_ipa_clk, >>       [RPM_SMD_IPA_A_CLK] = &clk_smd_rpm_ipa_a_clk, >> -    [RPM_SMD_QUP_CLK] = &clk_smd_rpm_qup_clk, >> -    [RPM_SMD_QUP_A_CLK] = &clk_smd_rpm_qup_a_clk, >> -    [RPM_SMD_MMRT_CLK] = &clk_smd_rpm_mmrt_clk, >> -    [RPM_SMD_MMRT_A_CLK] = &clk_smd_rpm_mmrt_a_clk, >> -    [RPM_SMD_MMNRT_CLK] = &clk_smd_rpm_mmnrt_clk, >> -    [RPM_SMD_MMNRT_A_CLK] = &clk_smd_rpm_mmnrt_a_clk, >>       [RPM_SMD_SNOC_PERIPH_CLK] = &clk_smd_rpm_bus_0_snoc_periph_clk, >>       [RPM_SMD_SNOC_PERIPH_A_CLK] = &clk_smd_rpm_bus_0_snoc_periph_a_clk, >>       [RPM_SMD_SNOC_LPASS_CLK] = &clk_smd_rpm_bus_5_snoc_lpass_clk, >> @@ -1249,6 +1190,8 @@ static struct clk_smd_rpm *qcm2290_clks[] = { >>   static const struct rpm_smd_clk_desc rpm_clk_qcm2290 = { >>       .clks = qcm2290_clks, >>       .num_clks = ARRAY_SIZE(qcm2290_clks), >> +    .icc_clks = sm_qnoc_icc_clks, >> +    .num_icc_clks = ARRAY_SIZE(sm_qnoc_icc_clks) >>   }; >>     static const struct of_device_id rpm_smd_clk_match_table[] = { >> @@ -1324,6 +1267,15 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) >>               goto err; >>       } >>   +    for (i = 0; i < desc->num_icc_clks; i++) { >> +        if (!desc->icc_clks[i]) >> +            continue; >> + >> +        ret = clk_smd_rpm_handoff(desc->icc_clks[i]); >> +        if (ret) >> +            goto err; >> +    } >> + >>       if (!desc->scaling_before_handover) { >>           ret = clk_smd_rpm_enable_scaling(); >>           if (ret) >> >