| Message ID | 20230113152232.2624545-1-konrad.dybcio@linaro.org |
|---|---|
| State | Accepted |
| Commit | a36489778ba8f7eb98c3e9fca2d300090bf1ffcd |
| Headers | show |
| Series | [1/2] Revert "soc: qcom: rpmpd: Add SM4250 support" | expand |
On 13/01/2023 17:36, Konrad Dybcio wrote: > > > On 13.01.2023 17:33, Krzysztof Kozlowski wrote: >> On 13/01/2023 16:22, Konrad Dybcio wrote: >>> SM4250 and SM6115 use a shared device tree and the RPMPDs are >>> identical. There's no need for a separate entry, so remove it. >>> >>> This reverts commit 45ac44ed10e58cf9b510e6552317ed7d2602346f. >>> >>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >>> --- >>> .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 - >>> include/dt-bindings/power/qcom-rpmpd.h | 10 ---------- >>> 2 files changed, 11 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml >>> index 633d49884019..5bb9f59d196f 100644 >>> --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml >>> +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml >>> @@ -39,7 +39,6 @@ properties: >>> - qcom,sdm845-rpmhpd >>> - qcom,sdx55-rpmhpd >>> - qcom,sdx65-rpmhpd >>> - - qcom,sm4250-rpmpd >> >> Yet, dedicated compatibles are usually recommended. Maybe this should be >> used with fallback: >> "qcom,sm4250-rpmpd", "qcom,sm6115-rpmpd" > The compatible has never been used so far and it's really the > same situation as SDM630/660 AFAIK, so I don't think it makes > much sense. OK, assuming these are almost the same SoCs in that aspect: Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Fri, 13 Jan 2023 16:22:31 +0100, Konrad Dybcio wrote: > SM4250 and SM6115 use a shared device tree and the RPMPDs are > identical. There's no need for a separate entry, so remove it. > > This reverts commit 5b617b1b10c1c6a4365d8f956032e95c53b8e388. > > Applied, thanks! [1/2] Revert "soc: qcom: rpmpd: Add SM4250 support" commit: a36489778ba8f7eb98c3e9fca2d300090bf1ffcd [2/2] Revert "dt-bindings: power: rpmpd: Add SM4250 support" commit: dfe5ac7023624617d402ca1c295552fbd271e20c Best regards,
diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index f0db6a10cf4e..337b1ad1cd3b 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -471,23 +471,6 @@ static const struct rpmpd_desc qcm2290_desc = { .max_state = RPM_SMD_LEVEL_TURBO_NO_CPR, }; -static struct rpmpd *sm4250_rpmpds[] = { - [SM4250_VDDCX] = &sm6115_vddcx, - [SM4250_VDDCX_AO] = &sm6115_vddcx_ao, - [SM4250_VDDCX_VFL] = &sm6115_vddcx_vfl, - [SM4250_VDDMX] = &sm6115_vddmx, - [SM4250_VDDMX_AO] = &sm6115_vddmx_ao, - [SM4250_VDDMX_VFL] = &sm6115_vddmx_vfl, - [SM4250_VDD_LPI_CX] = &sm6115_vdd_lpi_cx, - [SM4250_VDD_LPI_MX] = &sm6115_vdd_lpi_mx, -}; - -static const struct rpmpd_desc sm4250_desc = { - .rpmpds = sm4250_rpmpds, - .num_pds = ARRAY_SIZE(sm4250_rpmpds), - .max_state = RPM_SMD_LEVEL_TURBO_NO_CPR, -}; - static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,mdm9607-rpmpd", .data = &mdm9607_desc }, { .compatible = "qcom,msm8226-rpmpd", .data = &msm8226_desc }, @@ -502,7 +485,6 @@ static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,qcm2290-rpmpd", .data = &qcm2290_desc }, { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc }, { .compatible = "qcom,sdm660-rpmpd", .data = &sdm660_desc }, - { .compatible = "qcom,sm4250-rpmpd", .data = &sm4250_desc }, { .compatible = "qcom,sm6115-rpmpd", .data = &sm6115_desc }, { .compatible = "qcom,sm6125-rpmpd", .data = &sm6125_desc }, { .compatible = "qcom,sm6375-rpmpd", .data = &sm6375_desc },
SM4250 and SM6115 use a shared device tree and the RPMPDs are identical. There's no need for a separate entry, so remove it. This reverts commit 5b617b1b10c1c6a4365d8f956032e95c53b8e388. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/soc/qcom/rpmpd.c | 18 ------------------ 1 file changed, 18 deletions(-)