Unverified Commit 73663824 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge drm/drm-next into drm-misc-next 



drm-misc-next hasn't been updated in a while and I need a post -rc2
state to merge some vc4 patches.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parents 525bbf72 6f2f7c83

Documentation/admin-guide/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ Configuring the kernel 
Compiling the kernel

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



 - Make sure you have at least gcc 4.9 available.

 - Make sure you have at least gcc 5.1 available.

   For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.



   Please note that you can still run a.out user programs with this kernel.

Documentation/devicetree/bindings/arm/tegra.yaml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ properties: 
          - const: toradex,apalis_t30

          - const: nvidia,tegra30

      - items:

          - const: toradex,apalis_t30-eval-v1.1

          - const: toradex,apalis_t30-v1.1-eval

          - const: toradex,apalis_t30-eval

          - const: toradex,apalis_t30-v1.1

          - const: toradex,apalis_t30

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ function block. 


All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.

For a description of the MMSYS_CONFIG binding, see

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.



DISP function blocks

====================

Documentation/devicetree/bindings/display/renesas,du.yaml

+51 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
      - renesas,du-r8a77980 # for R-Car V3H compatible DU

      - renesas,du-r8a77990 # for R-Car E3 compatible DU

      - renesas,du-r8a77995 # for R-Car D3 compatible DU

      - renesas,du-r8a779a0 # for R-Car V3U compatible DU



  reg:

    maxItems: 1
@@ -773,6 +774,56 @@ allOf: 
        - reset-names

        - renesas,vsps



  - if:

      properties:

        compatible:

          contains:

            enum:

              - renesas,du-r8a779a0

    then:

      properties:

        clocks:

          items:

            - description: Functional clock



        clock-names:

          maxItems: 1

          items:

            - const: du.0



        interrupts:

          maxItems: 2



        resets:

          maxItems: 1



        reset-names:

          items:

            - const: du.0



        ports:

          properties:

            port@0:

              description: DSI 0

            port@1:

              description: DSI 1

            port@2: false

            port@3: false



          required:

            - port@0

            - port@1



        renesas,vsps:

          minItems: 2



      required:

        - clock-names

        - interrupts

        - resets

        - reset-names

        - renesas,vsps



additionalProperties: false



examples:

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ properties: 
      - const: allwinner,sun8i-v3s-emac

      - const: allwinner,sun50i-a64-emac

      - items:

          - const: allwinner,sun50i-h6-emac

          - enum:

              - allwinner,sun20i-d1-emac

              - allwinner,sun50i-h6-emac

          - const: allwinner,sun50i-a64-emac



  reg: