2022-12-22 21:32:20

by Marijn Suijten

[permalink] [raw]
Subject: [PATCH] clk: qcom: dispcc-sm6125: Fix compatible string to match bindings

According to generic rules the SoC name should be first:

arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dtb: clock-controller@5f00000: compatible: 'oneOf' conditional failed, one must be fixed:
'qcom,dispcc-sm6125' does not match '^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$'

And this is already reflected by the bindings submitted prior to the
addition of this driver. Any DTS following these rules will end up with
a non-probing driver because of this mismatch.

Fixes: 6e87c8f07407 ("clk: qcom: Add display clock controller driver for SM6125")
Signed-off-by: Marijn Suijten <[email protected]>
---
drivers/clk/qcom/dispcc-sm6125.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/qcom/dispcc-sm6125.c b/drivers/clk/qcom/dispcc-sm6125.c
index b921456a2e0d..87b27053ddb6 100644
--- a/drivers/clk/qcom/dispcc-sm6125.c
+++ b/drivers/clk/qcom/dispcc-sm6125.c
@@ -667,7 +667,7 @@ static const struct qcom_cc_desc disp_cc_sm6125_desc = {
};

static const struct of_device_id disp_cc_sm6125_match_table[] = {
- { .compatible = "qcom,dispcc-sm6125" },
+ { .compatible = "qcom,sm6125-dispcc" },
{ }
};
MODULE_DEVICE_TABLE(of, disp_cc_sm6125_match_table);
--
2.39.0


Subject: Re: [PATCH] clk: qcom: dispcc-sm6125: Fix compatible string to match bindings

Il 22/12/22 22:01, Marijn Suijten ha scritto:
> According to generic rules the SoC name should be first:
>
> arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dtb: clock-controller@5f00000: compatible: 'oneOf' conditional failed, one must be fixed:
> 'qcom,dispcc-sm6125' does not match '^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$'
>
> And this is already reflected by the bindings submitted prior to the
> addition of this driver. Any DTS following these rules will end up with
> a non-probing driver because of this mismatch.
>
> Fixes: 6e87c8f07407 ("clk: qcom: Add display clock controller driver for SM6125")
> Signed-off-by: Marijn Suijten <[email protected]>

Since there's no devicetree that is currently using the wrong compatible, you
are *not* breaking anything - hence fixing that issue without any regression.

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>


2022-12-29 17:57:46

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] clk: qcom: dispcc-sm6125: Fix compatible string to match bindings

On Thu, 22 Dec 2022 22:01:40 +0100, Marijn Suijten wrote:
> According to generic rules the SoC name should be first:
>
> arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dtb: clock-controller@5f00000: compatible: 'oneOf' conditional failed, one must be fixed:
> 'qcom,dispcc-sm6125' does not match '^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$'
>
> And this is already reflected by the bindings submitted prior to the
> addition of this driver. Any DTS following these rules will end up with
> a non-probing driver because of this mismatch.
>
> [...]

Applied, thanks!

[1/1] clk: qcom: dispcc-sm6125: Fix compatible string to match bindings
commit: c045154c30f1cf8d96e3f32269c155b3706a1669

Best regards,
--
Bjorn Andersson <[email protected]>