Commit 02af1db0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back thermal control material for v6.1.

parents d92e600f 393d0f5c

Documentation/atomic_bitops.txt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ Like with atomic_t, the rule of thumb is: 
 - RMW operations that have a return value are fully ordered.



 - RMW operations that are conditional are unordered on FAILURE,

   otherwise the above rules apply. In the case of test_and_{}_bit() operations,

   otherwise the above rules apply. In the case of test_and_set_bit_lock(),

   if the bit in memory is unchanged by the operation then it is deemed to have

   failed.

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun8i-v3s-tcon

              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:
@@ -252,6 +253,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-tv

              - allwinner,sun8i-r40-tcon-tv

              - allwinner,sun9i-a80-tcon-tv

              - allwinner,sun20i-d1-tcon-tv



    then:

      properties:
@@ -278,6 +280,7 @@ allOf: 
              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun4i-a10-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      required:
@@ -294,6 +297,7 @@ allOf: 
              - allwinner,sun8i-a23-tcon

              - allwinner,sun8i-a33-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:

Documentation/devicetree/bindings/net/qcom-emac.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ MAC node: 
- mac-address : The 6-byte MAC address. If present, it is the default

	MAC address.

- internal-phy : phandle to the internal PHY node

- phy-handle : phandle the external PHY node

- phy-handle : phandle to the external PHY node



Internal PHY node:

- compatible : Should be "qcom,fsm9900-emac-sgmii" or "qcom,qdf2432-emac-sgmii".

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml

+0 −11
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ properties: 
        description:

          Properties for single LDO regulator.



        properties:

          regulator-name:

            pattern: "^LDO[1-5]$"

            description:

              should be "LDO1", ..., "LDO5"



        unevaluatedProperties: false



      "^BUCK[1-6]$":
@@ -62,11 +56,6 @@ properties: 
          Properties for single BUCK regulator.



        properties:

          regulator-name:

            pattern: "^BUCK[1-6]$"

            description:

              should be "BUCK1", ..., "BUCK6"



          nxp,dvs-run-voltage:

            $ref: "/schemas/types.yaml#/definitions/uint32"

            minimum: 600000

Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ description: 
  See spi-peripheral-props.yaml for more info.



maintainers:

  - Pratyush Yadav <p.yadav@ti.com>

  - Vaishnav Achath <vaishnav.a@ti.com>



properties:

  # cdns,qspi-nor.yaml