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

Merge branch 'dt/linus' into dt/next

parents 1b25b207 efe84d40

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
  compatible:

    items:

      - const: raspberrypi,bcm2835-firmware

      - const: simple-bus

      - const: simple-mfd



  mboxes:

    $ref: '/schemas/types.yaml#/definitions/phandle'
@@ -57,7 +57,7 @@ required: 
examples:

  - |

    firmware {

        compatible = "raspberrypi,bcm2835-firmware", "simple-bus";

        compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";

        mboxes = <&mailbox>;



        firmware_clocks: clocks {

Documentation/devicetree/bindings/clock/imx23-clock.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Clock bindings for Freescale i.MX23



maintainers:

  - Shawn Guo <shawn.guo@linaro.org>

  - Shawn Guo <shawnguo@kernel.org>



description: |

  The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/clock/imx28-clock.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Clock bindings for Freescale i.MX28



maintainers:

  - Shawn Guo <shawn.guo@linaro.org>

  - Shawn Guo <shawnguo@kernel.org>



description: |

  The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ examples: 


    main_crypto: crypto@4e00000 {

        compatible = "ti,j721-sa2ul";

        reg = <0x0 0x4e00000 0x0 0x1200>;

        reg = <0x4e00000 0x1200>;

        power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;

        dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,

               <&main_udmap 0x4001>;

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

+4 −4
Original line number Diff line number Diff line
@@ -145,10 +145,10 @@ examples: 


    display@fd4a0000 {

        compatible = "xlnx,zynqmp-dpsub-1.7";

        reg = <0x0 0xfd4a0000 0x0 0x1000>,

              <0x0 0xfd4aa000 0x0 0x1000>,

              <0x0 0xfd4ab000 0x0 0x1000>,

              <0x0 0xfd4ac000 0x0 0x1000>;

        reg = <0xfd4a0000 0x1000>,

              <0xfd4aa000 0x1000>,

              <0xfd4ab000 0x1000>,

              <0xfd4ac000 0x1000>;

        reg-names = "dp", "blend", "av_buf", "aud";

        interrupts = <0 119 4>;

        interrupt-parent = <&gic>;