Commit 7e5ff591 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next

parents 9f60a65b 0903060f

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ properties: 
    description:

      See section 2.3.9 of the DeviceTree Specification.



  '#address-cells': true



  '#size-cells': true



required:

  - "#interconnect-cells"

  - compatible
@@ -59,6 +63,8 @@ examples: 
        compatible = "allwinner,sun5i-a13-mbus";

        reg = <0x01c01000 0x1000>;

        clocks = <&ccu CLK_MBUS>;

        #address-cells = <1>;

        #size-cells = <1>;

        dma-ranges = <0x00000000 0x40000000 0x20000000>;

        #interconnect-cells = <1>;

    };

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ required: 


examples:

  - |

    vco1: clock@00 {

    vco1: clock {

      compatible = "arm,impd1-vco1";

      #clock-cells = <0>;

      lock-offset = <0x08>;

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

+2 −2
Original line number Diff line number Diff line 
Analog Device ADV7123 Video DAC

-------------------------------

Analog Devices ADV7123 Video DAC

--------------------------------



The ADV7123 is a digital-to-analog converter that outputs VGA signals from a

parallel video input.

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

+2 −2
Original line number Diff line number Diff line 
Analog Device ADV7511(W)/13/33/35 HDMI Encoders

-----------------------------------------

Analog Devices ADV7511(W)/13/33/35 HDMI Encoders

------------------------------------------------



The ADV7511, ADV7511W, ADV7513, ADV7533 and ADV7535 are HDMI audio and video

transmitters compatible with HDMI 1.4 and DVI 1.0. They support color space

Documentation/devicetree/bindings/dma/adi,axi-dmac.txt

+1 −1
Original line number Diff line number Diff line 
Analog Device AXI-DMAC DMA controller

Analog Devices AXI-DMAC DMA controller



Required properties:

 - compatible: Must be "adi,axi-dmac-1.00.a".