Commit 9e634138 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

Merge drm/drm-next into drm-xe-next 

Bring in series "drm/{i915,xe}: sort out step enums between the drivers"
that was merged through i915.

Link: https://lore.kernel.org/all/cover.1772635152.git.jani.nikula@intel.com


Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parents 7937ea73 d93f8ea0

Documentation/devicetree/bindings/arm/qcom.yaml

+6 −0
Original line number Diff line number Diff line
@@ -844,6 +844,12 @@ properties: 
              - google,sargo

          - const: qcom,sdm670



      - items:

          - enum:

              - google,bonito-tianma

          - const: google,bonito

          - const: qcom,sdm670



      - items:

          - enum:

              - qcom,sdx55-mtp

Documentation/devicetree/bindings/display/panel/abt,y030xx067a.yaml

+0 −5
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ properties: 
  reg:

    maxItems: 1



  backlight: true

  port: true

  power-supply: true

  reset-gpios: true



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/panel/advantech,idk-1110wr.yaml

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ properties: 
  panel-timing: true

  port: true



additionalProperties: false



required:

  - compatible

  - data-mapping
@@ -51,6 +49,8 @@ required: 
  - panel-timing

  - port



additionalProperties: false



examples:

  - |+

    panel {

Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ properties: 
      - port@0

      - port@1



additionalProperties: false



required:

  - compatible

  - width-mm
@@ -65,6 +63,8 @@ required: 
  - data-mapping

  - panel-timing



additionalProperties: false



examples:

  - |+

    panel-lvds {

Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ properties: 
  enable-gpios: true

  port: true



additionalProperties: false



required:

  - compatible

  - power-supply



additionalProperties: false



...