Inter-revision diff: patch 1

Comparing v2 (message) to v3 (message)

--- v2
+++ v3
@@ -10,7 +10,7 @@
 
 diff --git a/Documentation/devicetree/bindings/input/qcom,spmi-haptics.yaml b/Documentation/devicetree/bindings/input/qcom,spmi-haptics.yaml
 new file mode 100644
-index 000000000000..8ef9b4ec3a07
+index 000000000000..21e1fba98ae1
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/input/qcom,spmi-haptics.yaml
 @@ -0,0 +1,128 @@
@@ -30,15 +30,15 @@
 +  Qualcomm SPMI haptics is a peripheral on some QTI PMICs. It supports linear resonant
 +  actuators and eccentric rotating mass type haptics commonly found in mobile devices.
 +  It supports multiple sources of wave data such as an internal buffer, direct play
-+  (from kernel or userspace) as well as an audio output mode.
++  (from kernel or userspace) as well as an audio mode.
 +
 +properties:
 +  compatible:
 +    items:
 +      - enum:
-+        - qcom,pmi8998-haptics
-+        - qcom,pmi8996-haptics
-+        - qcom,pmi8941-haptics
++          - qcom,pmi8998-haptics
++          - qcom,pmi8996-haptics
++          - qcom,pmi8941-haptics
 +      - const: qcom,spmi-haptics
 +
 +  reg:
@@ -88,9 +88,8 @@
 +
 +  qcom,wave-play-rate-us:
 +    description: |
-+      Wave sample durection in microseconds, 1/f where f
++      Wave play rate in microseconds, 1/f where f
 +      is the resonant frequency of the actuator.
-+    $ref: /schemas/types.yaml#/definitions/uint32
 +    minimum: 0
 +    maximum: 20475
 +
@@ -98,7 +97,7 @@
 +    minItems: 4
 +    maxItems: 4
 +    description: |
-+      The brake pattern are the strengths of the pattern
++      The brake pattern is an array of amplitudes
 +      used to brake the haptics. Allowed values are,
 +        0 - 0V
 +        1 - Vmax/4
@@ -106,6 +105,8 @@
 +        3 - Vmax
 +    $ref: /schemas/types.yaml#/definitions/uint32-array
 +    default: [0x3, 0x3, 0x2, 0x1]
++    items:
++      enum: [ 0, 1, 2, 3 ]
 +
 +required:
 +  - compatible
@@ -121,7 +122,7 @@
 +    #include <dt-bindings/interrupt-controller/irq.h>
 +    #include <dt-bindings/input/qcom,spmi-haptics.h>
 +
-+    pmi8998_lsid1: pmic@3 {
++    pmic@3 {
 +      compatible = "qcom,pmi8998", "qcom,spmi-pmic";
 +      reg = <0x3 SPMI_USID>;
 +      #address-cells = <1>;
@@ -136,21 +137,20 @@
 +        interrupt-names = "short", "play";
 +
 +        qcom,wave-shape = <HAP_WAVE_SINE>;
++        qcom,wave-play-rate-us = <4255>;
 +        qcom,play-mode = <HAP_PLAY_BUFFER>;
 +        qcom,brake-pattern = <0x3 0x3 0x2 0x1>;
-+
-+        status = "disabled";
 +      };
 +    };
 diff --git a/include/dt-bindings/input/qcom,spmi-haptics.h b/include/dt-bindings/input/qcom,spmi-haptics.h
 new file mode 100644
-index 000000000000..14a7e7d1471e
+index 000000000000..b3b9478b3217
 --- /dev/null
 +++ b/include/dt-bindings/input/qcom,spmi-haptics.h
 @@ -0,0 +1,32 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
++/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-2-Clause) */
 +/*
-+ * This header provides constants for pmi8998 SPMI haptics options.
++ * This header provides constants for QCOM SPMI haptics hardware configuration.
 + */
 +
 +#ifndef _DT_BINDINGS_QCOM_PMIC_SPMI_HAPTICS_
@@ -181,6 +181,6 @@
 +
 +#endif /* _DT_BINDINGS_QCOM_PMIC_SPMI_HAPTICS_ */
 --
-2.31.1
+2.32.0
 
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help