by Stephen Boyd

[permalink] [raw]

Subject: Re: [PATCH 01/21] clk: qcom: smd: Add support for MSM8992/4 rpm clocks

Quoting Konrad Dybcio (2020-06-20 07:46:17)
> Add rpm smd clocks, PMIC and bus clocks which are required on MSM8992,
> MSM8994 (and APQ variants) for clients to vote on.

We really should move the bus clks to be in the interconnect framework.

>
> Signed-off-by: Konrad Dybcio <[email protected]>
> ---
> diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
> index 90a1349bc713..f864ea69a590 100644
> --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
> +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
> @@ -17,6 +17,8 @@ Required properties :
> "qcom,rpmcc-msm8976", "qcom,rpmcc"
> "qcom,rpmcc-apq8064", "qcom,rpmcc"
> "qcom,rpmcc-ipq806x", "qcom,rpmcc"
> + "qcom,rpmcc-msm8992", "qcom,rpmcc"
> + "qcom,rpmcc-msm8994", "qcom,rpmcc"

Indentation is off.

> "qcom,rpmcc-msm8996", "qcom,rpmcc"
> "qcom,rpmcc-msm8998", "qcom,rpmcc"
> "qcom,rpmcc-qcs404", "qcom,rpmcc"
> diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
> index 52f63ad787ba..429517340148 100644
> --- a/drivers/clk/qcom/clk-smd-rpm.c
> +++ b/drivers/clk/qcom/clk-smd-rpm.c
> @@ -574,6 +574,176 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8976 = {
> .num_clks = ARRAY_SIZE(msm8976_clks),
> };
[...]
> + [RPM_SMD_RF_CLK1_A_PIN] = &msm8994_rf_clk1_a_pin,
> + [RPM_SMD_RF_CLK2_PIN] = &msm8994_rf_clk2_pin,
> + [RPM_SMD_RF_CLK2_A_PIN] = &msm8994_rf_clk2_a_pin,
> + [RPM_SMD_CE1_CLK] = &msm8994_ce1_clk,
> + [RPM_SMD_CE1_A_CLK] = &msm8994_ce1_a_clk,
> + [RPM_SMD_CE2_CLK] = &msm8994_ce2_clk,
> + [RPM_SMD_CE2_A_CLK] = &msm8994_ce2_a_clk,
> + [RPM_SMD_CE3_CLK] = &msm8994_ce3_clk,
> + [RPM_SMD_CE3_A_CLK] = &msm8994_ce3_a_clk,
> +};
> +
> +static const struct rpm_smd_clk_desc rpm_clk_msm8994 = {
> + .clks = msm8994_clks,
> + .num_clks = ARRAY_SIZE(msm8994_clks),
> +};
> +
> +

Please drop the extra newline.

> /* msm8996 */
> DEFINE_CLK_SMD_RPM(msm8996, pcnoc_clk, pcnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 0);
> DEFINE_CLK_SMD_RPM(msm8996, snoc_clk, snoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 1);
> @@ -770,6 +940,8 @@ static const struct of_device_id rpm_smd_clk_match_table[] = {
> { .compatible = "qcom,rpmcc-msm8916", .data = &rpm_clk_msm8916 },
> { .compatible = "qcom,rpmcc-msm8974", .data = &rpm_clk_msm8974 },
> { .compatible = "qcom,rpmcc-msm8976", .data = &rpm_clk_msm8976 },
> + { .compatible = "qcom,rpmcc-msm8992", .data = &rpm_clk_msm8992 },
> + { .compatible = "qcom,rpmcc-msm8994", .data = &rpm_clk_msm8994 },
> { .compatible = "qcom,rpmcc-msm8996", .data = &rpm_clk_msm8996 },
> { .compatible = "qcom,rpmcc-msm8998", .data = &rpm_clk_msm8998 },
> { .compatible = "qcom,rpmcc-qcs404", .data = &rpm_clk_qcs404 },
> diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h
> index ae74c43c485d..9cbf17027afd 100644
> --- a/include/dt-bindings/clock/qcom,rpmcc.h
> +++ b/include/dt-bindings/clock/qcom,rpmcc.h
> @@ -133,5 +133,9 @@
> #define RPM_SMD_RF_CLK3_A 87
> #define RPM_SMD_RF_CLK3_PIN 88
> #define RPM_SMD_RF_CLK3_A_PIN 89
> +#define RPM_SMD_CE2_CLK 90
> +#define RPM_SMD_CE2_A_CLK 91
> +#define RPM_SMD_CE3_CLK 92
> +#define RPM_SMD_CE3_A_CLK 93
>

This is wrecked by other patches you've sent. Please resend just this
patch to clk maintainers with these two things fixed.