On 1.06.2023 12:11, Dmitry Baryshkov wrote:
> On 01/06/2023 13:10, Konrad Dybcio wrote:
>>
>>
>> On 1.06.2023 12:08, Dmitry Baryshkov wrote:
>>> On 30/05/2023 13:20, Konrad Dybcio wrote:
>>>> Assign the necessary definitions to migrate to the new bus clock
>>>> handling mechanism.
>>>>
>>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
>>>> ---
>>>> drivers/interconnect/qcom/msm8996.c | 7 +++++++
>>>> 1 file changed, 7 insertions(+)
>>>>
>>>> diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c
>>>> index 1f7e88a37acd..a596f4035d2e 100644
>>>> --- a/drivers/interconnect/qcom/msm8996.c
>>>> +++ b/drivers/interconnect/qcom/msm8996.c
>>>> @@ -1840,6 +1840,7 @@ static const struct qcom_icc_desc msm8996_a1noc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = a1noc_nodes,
>>>> .num_nodes = ARRAY_SIZE(a1noc_nodes),
>>>> + .bus_clk_desc = &aggre1_branch_clk,
>>>> .regmap_cfg = &msm8996_a1noc_regmap_config
>>>> };
>>>> @@ -1861,6 +1862,7 @@ static const struct qcom_icc_desc msm8996_a2noc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = a2noc_nodes,
>>>> .num_nodes = ARRAY_SIZE(a2noc_nodes),
>>>> + .bus_clk_desc = &aggre2_branch_clk,
>>>> .intf_clocks = a2noc_intf_clocks,
>>>> .num_intf_clocks = ARRAY_SIZE(a2noc_intf_clocks),
>>>> .regmap_cfg = &msm8996_a2noc_regmap_config
>>>> @@ -1889,6 +1891,7 @@ static const struct qcom_icc_desc msm8996_bimc = {
>>>> .type = QCOM_ICC_BIMC,
>>>> .nodes = bimc_nodes,
>>>> .num_nodes = ARRAY_SIZE(bimc_nodes),
>>>> + .bus_clk_desc = &bimc_clk,
>>>> .regmap_cfg = &msm8996_bimc_regmap_config
>>>> };
>>>> @@ -1947,6 +1950,7 @@ static const struct qcom_icc_desc msm8996_cnoc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = cnoc_nodes,
>>>> .num_nodes = ARRAY_SIZE(cnoc_nodes),
>>>> + .bus_clk_desc = &bus_2_clk,
>>>> .regmap_cfg = &msm8996_cnoc_regmap_config
>>>> };
>>>> @@ -2000,6 +2004,7 @@ static const struct qcom_icc_desc msm8996_mnoc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = mnoc_nodes,
>>>> .num_nodes = ARRAY_SIZE(mnoc_nodes),
>>>> + .bus_clk_desc = &mmaxi_0_clk,
>>>
>>> What about an ahb_clk_src here?
>> This should be remodeled to MNoC (MMAXI clk) + MNoC_AHB (ahb_clk_src).
>>
>> I can fix this after this series.
>
> As long as it doesn't result in a regression.
"works on my machine".. We've not been setting the rate on it
before and it's currently turned on by being an intf_clock, so
I think it doesn't even change the behavior.
Konrad
>
>> Konrad
>>>
>>>> .intf_clocks = mm_intf_clocks,
>>>> .num_intf_clocks = ARRAY_SIZE(mm_intf_clocks),
>>>> .regmap_cfg = &msm8996_mnoc_regmap_config
>>>> @@ -2038,6 +2043,7 @@ static const struct qcom_icc_desc msm8996_pnoc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = pnoc_nodes,
>>>> .num_nodes = ARRAY_SIZE(pnoc_nodes),
>>>> + .bus_clk_desc = &bus_0_clk,
>>>> .regmap_cfg = &msm8996_pnoc_regmap_config
>>>> };
>>>> @@ -2082,6 +2088,7 @@ static const struct qcom_icc_desc msm8996_snoc = {
>>>> .type = QCOM_ICC_NOC,
>>>> .nodes = snoc_nodes,
>>>> .num_nodes = ARRAY_SIZE(snoc_nodes),
>>>> + .bus_clk_desc = &bus_1_clk,
>>>> .regmap_cfg = &msm8996_snoc_regmap_config
>>>> };
>>>>
>>>
>
