Commit 9635adf8 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Merge drm/drm-next into drm-intel-gt-next 



Lets eradicate a silent conflict between drm-intel-next and
drm-intel-gt-next which added a duplicate function (try_firmware_load).

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parents 1ec23ed7 045e8d10

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
*.o.*

*.patch

*.rmeta

*.rpm

*.rsi

*.s

*.so

Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml

+62 −6
Original line number Diff line number Diff line
@@ -52,10 +52,50 @@ properties: 
    maxItems: 1

    description: extcon specifier for the Power Delivery



  port:

    $ref: /schemas/graph.yaml#/properties/port

  ports:

    $ref: /schemas/graph.yaml#/properties/ports



    properties:

      port@0:

        $ref: /schemas/graph.yaml#/$defs/port-base

        unevaluatedProperties: false

        description: A port node pointing to DPI host port node



        properties:

          endpoint:

            $ref: /schemas/graph.yaml#/$defs/endpoint-base

            unevaluatedProperties: false



            properties:

              link-frequencies:

                minItems: 1

                maxItems: 1

                description: Allowed max link frequencies in Hz



      port@1:

        $ref: /schemas/graph.yaml#/$defs/port-base

        unevaluatedProperties: false

        description: Video port for DP output



        properties:

          endpoint:

            $ref: /schemas/graph.yaml#/$defs/endpoint-base

            unevaluatedProperties: false



            properties:

              data-lanes:

                minItems: 1

                uniqueItems: true

                items:

                  - enum: [ 0, 1 ]

                  - const: 1

                  - const: 2

                  - const: 3



    required:

      - port@0

      - port@1



required:

  - compatible

  - ovdd-supply
@@ -63,6 +103,7 @@ required: 
  - interrupts

  - reset-gpios

  - extcon

  - ports



additionalProperties: false
@@ -85,9 +126,24 @@ examples: 
            reset-gpios = <&pio 179 1>;

            extcon = <&usbc_extcon>;



            port {

            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    it6505_in: endpoint {

                        remote-endpoint = <&dpi_out>;

                        link-frequencies = /bits/ 64 <150000000>;

                    };

                };



                port@1 {

                    reg = <1>;

                    it6505_out: endpoint {

                        remote-endpoint = <&dp_in>;

                        data-lanes = <0 1>;

                    };

                };

            };

        };

Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ description: | 


properties:

  compatible:

    const: ite,it66121

    enum:

      - ite,it66121

      - ite,it6610



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml

0 → 100644
+56 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/focaltech,gpt3.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Focaltech GPT3 3.0" (640x480 pixels) IPS LCD panel



maintainers:

  - Christophe Branchereau <cbranchereau@gmail.com>



allOf:

  - $ref: panel-common.yaml#

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



properties:

  compatible:

    const: focaltech,gpt3



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - power-supply

  - reset-gpios



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "focaltech,gpt3";

            reg = <0>;



            spi-max-frequency = <3125000>;



            reset-gpios = <&gpe 2 GPIO_ACTIVE_LOW>;



            backlight = <&backlight>;

            power-supply = <&vcc>;



            port {

                panel_input: endpoint {

                    remote-endpoint = <&panel_output>;

                };

            };

        };

    };

Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/himax,hx8394.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Himax HX8394 MIPI-DSI LCD panel controller



maintainers:

  - Ondrej Jirman <megi@xff.cz>

  - Javier Martinez Canillas <javierm@redhat.com>



description:

  Device tree bindings for panels based on the Himax HX8394 controller,

  such as the HannStar HSD060BHW4 720x1440 TFT LCD panel connected with

  a MIPI-DSI video interface.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    items:

      - enum:

          - hannstar,hsd060bhw4

      - const: himax,hx8394



  reg: true



  reset-gpios: true



  backlight: true



  port: true



  vcc-supply:

    description: Panel power supply



  iovcc-supply:

    description: I/O voltage supply



required:

  - compatible

  - reg

  - reset-gpios

  - backlight

  - port

  - vcc-supply

  - iovcc-supply



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        panel@0 {

            compatible = "hannstar,hsd060bhw4", "himax,hx8394";

            reg = <0>;

            vcc-supply = <&reg_2v8_p>;

            iovcc-supply = <&reg_1v8_p>;

            reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;

            backlight = <&backlight>;



            port {

                mipi_in_panel: endpoint {

                    remote-endpoint = <&mipi_out_panel>;

                };

            };

        };

    };



...