On 01/10/2022 01:14, Dmitry Baryshkov wrote:
> Merge qcom,saw2.txt bindings to existing qcom,spm.yaml. This fixes
> compatibility of qcom,spm schema with regulator SAW2 devices.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> .../devicetree/bindings/arm/msm/qcom,saw2.txt | 58 -------------------
> .../bindings/soc/qcom/qcom,spm.yaml | 44 +++++++++-----
You need to update reference in
Documentation/devicetree/bindings/arm/cpus.yaml
> 2 files changed, 30 insertions(+), 72 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
>
> diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt b/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
> deleted file mode 100644
> index c0e3c3a42bea..000000000000
> --- a/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -SPM AVS Wrapper 2 (SAW2)
> -
> -The SAW2 is a wrapper around the Subsystem Power Manager (SPM) and the
> -Adaptive Voltage Scaling (AVS) hardware. The SPM is a programmable
> -power-controller that transitions a piece of hardware (like a processor or
> -subsystem) into and out of low power modes via a direct connection to
> -the PMIC. It can also be wired up to interact with other processors in the
> -system, notifying them when a low power state is entered or exited.
> -
> -Multiple revisions of the SAW hardware are supported using these Device Nodes.
> -SAW2 revisions differ in the register offset and configuration data. Also, the
> -same revision of the SAW in different SoCs may have different configuration
> -data due the differences in hardware capabilities. Hence the SoC name, the
> -version of the SAW hardware in that SoC and the distinction between cpu (big
> -or Little) or cache, may be needed to uniquely identify the SAW register
> -configuration and initialization data. The compatible string is used to
> -indicate this parameter.
> -
> -PROPERTIES
> -
> -- compatible:
> - Usage: required
> - Value type: <string>
> - Definition: Must have
> - "qcom,saw2"
> - A more specific value could be one of:
> - "qcom,apq8064-saw2-v1.1-cpu"
> - "qcom,msm8226-saw2-v2.1-cpu"
> - "qcom,msm8974-saw2-v2.1-cpu"
> - "qcom,apq8084-saw2-v2.1-cpu"
> -
> -- reg:
> - Usage: required
> - Value type: <prop-encoded-array>
> - Definition: the first element specifies the base address and size of
> - the register region. An optional second element specifies
> - the base address and size of the alias register region.
> -
> -- regulator:
> - Usage: optional
> - Value type: boolean
> - Definition: Indicates that this SPM device acts as a regulator device
> - device for the core (CPU or Cache) the SPM is attached
> - to.
> -
> -Example 1:
> -
> - power-controller@2099000 {
> - compatible = "qcom,saw2";
> - reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
> - regulator;
> - };
> -
> -Example 2:
> - saw0: power-controller@f9089000 {
> - compatible = "qcom,apq8084-saw2-v2.1-cpu", "qcom,saw2";
> - reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>;
> - };
> diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml
> index f433e6e0a19f..8fe35fde70b8 100644
> --- a/Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml
> +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml
> @@ -16,23 +16,33 @@ description: |
>
> properties:
> compatible:
> - items:
> - - enum:
> - - qcom,sdm660-gold-saw2-v4.1-l2
> - - qcom,sdm660-silver-saw2-v4.1-l2
> - - qcom,msm8998-gold-saw2-v4.1-l2
> - - qcom,msm8998-silver-saw2-v4.1-l2
> - - qcom,msm8909-saw2-v3.0-cpu
> - - qcom,msm8916-saw2-v3.0-cpu
> - - qcom,msm8226-saw2-v2.1-cpu
> - - qcom,msm8974-saw2-v2.1-cpu
> - - qcom,apq8084-saw2-v2.1-cpu
> - - qcom,apq8064-saw2-v1.1-cpu
> + oneOf:
> - const: qcom,saw2
I understand old bindings had it, but I don't think we really want to
support the generic compatible on its own. Even old bindings indicated
that there are several differences between SAWs.
Especially confusing is that once qcom,saw2 can be alone and in other
cases must be preceded by specific compatible. IOW, you allow for
apq8064 two cases:
1. qcom,apq8064-saw2-v1.1-cpu, qcom,saw2
2. qcom,saw2
I think we should instead add everywhere specific compatibles.
> + - items:
> + - enum:
> + - qcom,sdm660-gold-saw2-v4.1-l2
> + - qcom,sdm660-silver-saw2-v4.1-l2
> + - qcom,msm8998-gold-saw2-v4.1-l2
> + - qcom,msm8998-silver-saw2-v4.1-l2
> + - qcom,msm8909-saw2-v3.0-cpu
> + - qcom,msm8916-saw2-v3.0-cpu
> + - qcom,msm8226-saw2-v2.1-cpu
> + - qcom,msm8974-saw2-v2.1-cpu
> + - qcom,apq8084-saw2-v2.1-cpu
> + - qcom,apq8064-saw2-v1.1-cpu
> + - const: qcom,saw2
>
> reg:
> - description: Base address and size of the SPM register region
> - maxItems: 1
> + description: Base address and size of the SPM register region. An optional
> + second element specifies the base address and size of the alias register
> + region.
> + minItems: 1
> + maxItems: 2
And it seems second region is not present on some variants?
> +
> + regulator:
> + type: boolean
> + description: Indicates that this SPM device acts as a regulator device
> + device for the core (CPU or Cache) the SPM is attached to.
>
> required:
> - compatible
> @@ -79,4 +89,10 @@ examples:
> reg = <0x17912000 0x1000>;
> };
Best regards,
Krzysztof
