| Message ID | 20220817145901.865977-2-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | a328ae8504dbc55f92be0e781aac301a23b5c21e |
| Headers | show |
| Series | ARM/hwlock: qcom: switch TCSR mutex to MMIO | expand |
On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > Commit 7677ed11e9fa ("dt-bindings: mfd: qcom,tcsr: Convert to dtschema") > converted bindings to DT schema literally - including the > qcom,tcsr-ipq6018 expecting syscon and simple-mfd. Such configuration > is not used in DTS and there is no actual need of it. The TCSR block is > purely configuration block and should not have children. Any child > device should be simply moved outside of TCSR syscon block. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../devicetree/bindings/mfd/qcom,tcsr.yaml | 40 +++++++++---------- > 1 file changed, 18 insertions(+), 22 deletions(-) Merge conflict. Please rebase.
diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml index e1c4936a0352..5d7f4ac21a8d 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml @@ -15,28 +15,24 @@ description: properties: compatible: - oneOf: - - items: - - enum: - - qcom,msm8998-tcsr - - qcom,sc7180-tcsr - - qcom,sc7280-tcsr - - qcom,sdm845-tcsr - - qcom,tcsr-apq8064 - - qcom,tcsr-apq8084 - - qcom,tcsr-ipq8064 - - qcom,tcsr-mdm9615 - - qcom,tcsr-msm8660 - - qcom,tcsr-msm8916 - - qcom,tcsr-msm8953 - - qcom,tcsr-msm8960 - - qcom,tcsr-msm8974 - - qcom,tcsr-msm8996 - - const: syscon - - items: - - const: qcom,tcsr-ipq6018 - - const: syscon - - const: simple-mfd + items: + - enum: + - qcom,msm8998-tcsr + - qcom,sc7180-tcsr + - qcom,sc7280-tcsr + - qcom,sdm845-tcsr + - qcom,tcsr-apq8064 + - qcom,tcsr-apq8084 + - qcom,tcsr-ipq6018 + - qcom,tcsr-ipq8064 + - qcom,tcsr-mdm9615 + - qcom,tcsr-msm8660 + - qcom,tcsr-msm8916 + - qcom,tcsr-msm8953 + - qcom,tcsr-msm8960 + - qcom,tcsr-msm8974 + - qcom,tcsr-msm8996 + - const: syscon reg: maxItems: 1
Commit 7677ed11e9fa ("dt-bindings: mfd: qcom,tcsr: Convert to dtschema") converted bindings to DT schema literally - including the qcom,tcsr-ipq6018 expecting syscon and simple-mfd. Such configuration is not used in DTS and there is no actual need of it. The TCSR block is purely configuration block and should not have children. Any child device should be simply moved outside of TCSR syscon block. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../devicetree/bindings/mfd/qcom,tcsr.yaml | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-)