Commit c3c51387 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Jassi Brar
Browse files

dt-bindings: mailbox: qcom,apcs: Add separate node for clock-controller 



APCS "global" is sort of a "miscellaneous" hardware block that combines
multiple registers inside the application processor subsystem. Two distinct
use cases are currently stuffed together in a single device tree node:

 - Mailbox: to communicate with other remoteprocs in the system.
 - Clock: for controlling the CPU frequency.

These two use cases have unavoidable circular dependencies: the mailbox is
needed as early as possible during boot to start controlling shared
resources like clocks and power domains, while the clock controller needs
one of these shared clocks as its parent. Currently, there is no way to
distinguish these two use cases for generic mechanisms like fw_devlink.

This is currently blocking conversion of the deprecated custom "qcom,ipc"
properties to the standard "mboxes", see e.g. commit d92e9ea2
("arm64: dts: qcom: msm8939: revert use of APCS mbox for RPM"):
  1. remoteproc &rpm needs mboxes = <&apcs1_mbox 8>;
  2. The clock controller inside &apcs1_mbox needs
     clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>.
  3. &rpmcc is a child of remoteproc &rpm

The mailbox itself does not need any clocks and should probe early to
unblock the rest of the boot process. The "clocks" are only needed for the
separate clock controller. In Linux, these are already two separate drivers
that can probe independently.

Break up the circular dependency chain in the device tree by separating the
clock controller into a separate child node. Deprecate the old approach of
specifying the clock properties as part of the root node, but keep them for
backwards compatibility.

Signed-off-by: default avatarStephan Gerhold <stephan.gerhold@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
parent 02e66dac

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+118 −51
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ properties: 
    description: phandles to the parent clocks of the clock driver

    minItems: 2

    maxItems: 3

    deprecated: true



  '#mbox-cells':

    const: 1
@@ -83,6 +84,23 @@ properties: 
  clock-names:

    minItems: 2

    maxItems: 3

    deprecated: true



  clock-controller:

    type: object

    additionalProperties: false

    properties:

      clocks:

        description: phandles to the parent clocks of the clock driver

        minItems: 2

        maxItems: 3



      '#clock-cells':

        enum: [0, 1]



      clock-names:

        minItems: 2

        maxItems: 3



required:

  - compatible
@@ -91,14 +109,19 @@ required: 


additionalProperties: false



allOf:

  - if:

# Clocks should be specified either on the parent node or on the child node

oneOf:

  - required:

      - clock-controller

    properties:

        compatible:

          contains:

            enum:

              - qcom,msm8916-apcs-kpss-global

    then:

      clocks: false

      clock-names: false

      '#clock-cells': false

  - properties:

      clock-controller: false



$defs:

  msm8916-apcs-clock-controller:

    properties:

      clocks:

        items:
@@ -108,14 +131,10 @@ allOf: 
        items:

          - const: pll

          - const: aux

      '#clock-cells':

        const: 0



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8939-apcs-kpss-global

    then:

  msm8939-apcs-clock-controller:

    properties:

      clocks:

        items:
@@ -127,14 +146,10 @@ allOf: 
          - const: pll

          - const: aux

          - const: ref

      '#clock-cells':

        const: 0



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdx55-apcs-gcc

    then:

  sdx55-apcs-clock-controller:

    properties:

      clocks:

        items:
@@ -146,14 +161,10 @@ allOf: 
          - const: ref

          - const: pll

          - const: aux

      '#clock-cells':

        const: 0



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,ipq6018-apcs-apps-global

    then:

  ipq6018-apcs-clock-controller:

    properties:

      clocks:

        items:
@@ -165,21 +176,45 @@ allOf: 
          - const: pll

          - const: xo

          - const: gpll0

      '#clock-cells':

        const: 1



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8953-apcs-kpss-global

              - qcom,msm8994-apcs-kpss-global

              - qcom,msm8996-apcs-hmss-global

              - qcom,qcm2290-apcs-hmss-global

              - qcom,sdm845-apss-shared

              - qcom,msm8916-apcs-kpss-global

    then:

      $ref: "#/$defs/msm8916-apcs-clock-controller"

      properties:

        clocks: false

        clock-names: false

        clock-controller:

          $ref: "#/$defs/msm8916-apcs-clock-controller"



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8939-apcs-kpss-global

    then:

      $ref: "#/$defs/msm8939-apcs-clock-controller"

      properties:

        clock-controller:

          $ref: "#/$defs/msm8939-apcs-clock-controller"



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdx55-apcs-gcc

    then:

      $ref: "#/$defs/sdx55-apcs-clock-controller"

      properties:

        clock-controller:

          $ref: "#/$defs/sdx55-apcs-clock-controller"



  - if:

      properties:
@@ -188,11 +223,26 @@ allOf: 
            enum:

              - qcom,ipq6018-apcs-apps-global

    then:

      $ref: "#/$defs/ipq6018-apcs-clock-controller"

      properties:

        '#clock-cells':

          const: 1

    else:

        clock-controller:

          $ref: "#/$defs/ipq6018-apcs-clock-controller"



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8953-apcs-kpss-global

              - qcom,msm8994-apcs-kpss-global

              - qcom,msm8996-apcs-hmss-global

              - qcom,qcm2290-apcs-hmss-global

              - qcom,sdm845-apss-shared

    then:

      properties:

        clocks: false

        clock-names: false

        clock-controller: false

        '#clock-cells':

          const: 0
@@ -217,6 +267,23 @@ examples: 
    };



  # Example apcs with qcs404

  - |

    #define GCC_APSS_AHB_CLK_SRC  1

    #define GCC_GPLL0_AO_OUT_MAIN 123

    mailbox@b011000 {

        compatible = "qcom,qcs404-apcs-apps-global",

                     "qcom,msm8916-apcs-kpss-global", "syscon";

        reg = <0x0b011000 0x1000>;

        #mbox-cells = <1>;



        apcs_clk: clock-controller {

          clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;

          clock-names = "pll", "aux";

          #clock-cells = <0>;

        };

    };



  # Example apcs with qcs404 (deprecated: use clock-controller subnode)

  - |

    #define GCC_APSS_AHB_CLK_SRC  1

    #define GCC_GPLL0_AO_OUT_MAIN 123