Commit 91f67b9a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick fixes that went via perf/urgent.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 5670ebf5 2475bf02

Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

+23 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ allOf: 
              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc
@@ -186,6 +185,29 @@ allOf: 
      required:

        - power-domains



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-a2noc



    then:

      properties:

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: aggre2_ufs_axi

            - const: ufs_axi



        clocks:

          items:

            - description: Bus Clock

            - description: Bus A Clock

            - description: Aggregate2 NoC UFS AXI Clock

            - description: UFS AXI Clock



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic G12A USB2 PHY
@@ -13,8 +13,8 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,a1-usb2-phy



  reg:

    maxItems: 1
@@ -68,7 +68,7 @@ additionalProperties: false 
examples:

  - |

    phy@36000 {

          compatible = "amlogic,meson-g12a-usb2-phy";

          compatible = "amlogic,g12a-usb2-phy";

          reg = <0x36000 0x2000>;

          clocks = <&xtal>;

          clock-names = "xtal";

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic G12A USB3 + PCIE Combo PHY
@@ -13,7 +13,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb3-pcie-phy

      - amlogic,g12a-usb3-pcie-phy



  reg:

    maxItems: 1
@@ -49,7 +49,7 @@ additionalProperties: false 
examples:

  - |

    phy@46000 {

          compatible = "amlogic,meson-g12a-usb3-pcie-phy";

          compatible = "amlogic,g12a-usb3-pcie-phy";

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";

Documentation/devicetree/bindings/phy/qcom,usb-hs-28nm.yaml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ properties: 
  compatible:

    enum:

      - qcom,usb-hs-28nm-femtophy

      - qcom,usb-hs-28nm-mdm9607



  reg:

    maxItems: 1

Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml

+2 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ properties: 
  qcom,protection-domain:

    $ref: /schemas/types.yaml#/definitions/string-array

    description: |

      Protection domain service name and path for APR service

      possible values are::

      Protection domain service name and path for APR service (if supported).

      Possible values are::

      "avs/audio", "msm/adsp/audio_pd".

      "kernel/elf_loader", "msm/modem/wlan_pd".

      "tms/servreg", "msm/adsp/audio_pd".
@@ -49,6 +49,5 @@ properties: 


required:

  - reg

  - qcom,protection-domain



additionalProperties: true