On 7/25/2023 1:53 PM, Krzysztof Kozlowski wrote:
On 25/07/2023 07:41, Fenglin Wu wrote:
Add compatible string 'qcom,spmi-vib-gen2' for vibrator module inside
PMI632, PMI7250B, PM7325B, PM7550BA. Also, add 'qcom,spmi-vib-gen1'
string for the SPMI vibrator inside PM8916 to maintain the completeness
of the hardware version history for SPMI vibrators.
Signed-off-by: Fenglin Wu <quic_fenglinw@xxxxxxxxxxx>
---
.../bindings/input/qcom,pm8xxx-vib.yaml | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml
index c8832cd0d7da..ab778714ad29 100644
--- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml
+++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml
@@ -11,10 +11,20 @@ maintainers:
properties:
compatible:
- enum:
- - qcom,pm8058-vib
- - qcom,pm8916-vib
- - qcom,pm8921-vib
+ oneOf:
+ - enum:
+ - qcom,pm8058-vib
+ - qcom,pm8916-vib
+ - qcom,pm8921-vib
+ - qcom,spmi-vib-gen1
+ - qcom,spmi-vib-gen2
Generic compatibles should not be alone. Drop both lines.
Sure. I will remove 'qcom,spmi-vib-gen2'.
Should I also keep 'qcom,spmi-vib-gen1' as generic compatible and move
'qcom,pm8916-vib' as its fallback as following?
compatible:
oneOf:
- enum:
- qcom,pm8058-vib
- qcom,pm8921-vib
- items:
- enum:
- qcom,pm8916-vib
- const: qcom,spmi-vib-gen1
- items:
- enum:
- qcom,pmi632-vib
- qcom,pm7250b-vib
- qcom,pm7325b-vib
- qcom,pm7550b-vib
- const: qcom,spmi-vib-gen2
I saw 'qcom,pm8916-vib' has been used in multiple DTS files and updating
it as a fallback will result updating those DTS files as well.
Or please help to suggest if there is any way to keep 'qcom,pm8916-vib'
and 'qcom,spmi-vib-gen1' compatible without updating existing DTS nodes.
Thanks
+ - items:
+ - enum:
+ - qcom,pmi632-vib
+ - qcom,pm7250b-vib
+ - qcom,pm7325b-vib
+ - qcom,pm7550b-vib
+ - const: qcom,spmi-vib-gen2
Best regards,
Krzysztof
