Commit eb32d1e4 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next

parents f1565285 d2334a91

Documentation/devicetree/bindings/arm/arm,scmi.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Required sub-node properties: 
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/power/power-domain.yaml

[3] Documentation/devicetree/bindings/thermal/thermal.txt

[4] Documentation/devicetree/bindings/sram/sram.txt

[4] Documentation/devicetree/bindings/sram/sram.yaml

[5] Documentation/devicetree/bindings/reset/reset.txt



Example:

Documentation/devicetree/bindings/arm/arm,scpi.txt

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ Required properties: 
[0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html

[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/thermal/thermal.txt

[3] Documentation/devicetree/bindings/sram/sram.txt

[3] Documentation/devicetree/bindings/sram/sram.yaml

[4] Documentation/devicetree/bindings/power/power-domain.yaml



Example:

Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Timer node: 


Syscon reboot node:



See Documentation/devicetree/bindings/power/reset/syscon-reboot.txt for the

See Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml for the

detailed list of properties, the two values defined below are specific to the

BCM6328-style timer:

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ properties: 
    $ref: '/schemas/types.yaml#/definitions/phandle-array'

    description: |

      List of phandles to idle state nodes supported

      by this cpu (see ./idle-states.txt).

      by this cpu (see ./idle-states.yaml).



  capacity-dmips-mhz:

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

Documentation/devicetree/bindings/arm/fsl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ properties: 
        items:

          - enum:

              - armadeus,imx6dl-apf6      # APF6 (Solo) SoM

              - armadeus,imx6dl-apf6dldev # APF6 (Solo) SoM on APF6Dev board

              - armadeus,imx6dl-apf6dev   # APF6 (Solo) SoM on APF6Dev board

              - eckelmann,imx6dl-ci4x10

              - emtrion,emcon-mx6         # emCON-MX6S or emCON-MX6DL SoM

              - emtrion,emcon-mx6-avari   # emCON-MX6S or emCON-MX6DL SoM on Avari Base