Commit 3e8d34ed authored by Jani Nikula's avatar Jani Nikula
Browse files

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



Need to bring commit d8bb92e7 ("drm/dp: Factor out a function to
probe a DPCD address") back as a dependency to further work in
drm-intel-next.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents f08699ec 19df0cfa

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>

Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/dev-tools/kunit/start.rst

+8 −3
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ or ``VFAT_FS``. To run ``FAT_KUNIT_TEST``, the ``.kunitconfig`` has: 
	CONFIG_MSDOS_FS=y

	CONFIG_FAT_KUNIT_TEST=y



1. A good starting point for the ``.kunitconfig``, is the KUnit default

   config. Run the command:

1. A good starting point for the ``.kunitconfig`` is the KUnit default config.

   You can generate it by running:



.. code-block:: bash



	cd $PATH_TO_LINUX_REPO

	cp tools/testing/kunit/configs/default.config .kunitconfig

	tools/testing/kunit/kunit.py config

	cat .kunit/.kunitconfig



.. note ::

   ``.kunitconfig`` lives in the ``--build_dir`` used by kunit.py, which is

   ``.kunit`` by default.



.. note ::

   You may want to remove CONFIG_KUNIT_ALL_TESTS from the ``.kunitconfig`` as

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml

+17 −2
Original line number Diff line number Diff line
@@ -41,17 +41,32 @@ properties: 


    properties:

      port@0:

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

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

        unevaluatedProperties: false

        description:

          Video port for MIPI DSI input



        properties:

          endpoint:

            $ref: /schemas/media/video-interfaces.yaml#

            unevaluatedProperties: false



            properties:

              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                items:

                  - const: 1

                  - const: 2

                  - const: 3

                  - const: 4



      port@1:

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

        description:

          Video port for MIPI DPI output (panel or connector).



    required:

      - port@0

      - port@1



required:

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ properties: 
  interrupts:

    maxItems: 1



  "#sound-dai-cells":

    const: 0



  ports:

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

Documentation/devicetree/bindings/display/bridge/lontium,lt9211.yaml

0 → 100644
+117 −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/bridge/lontium,lt9211.yaml#

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



title: Lontium LT9211 DSI/LVDS/DPI to DSI/LVDS/DPI bridge.



maintainers:

  - Marek Vasut <marex@denx.de>



description: |

  The LT9211 are bridge devices which convert Single/Dual-Link DSI/LVDS

  or Single DPI to Single/Dual-Link DSI/LVDS or Single DPI.



properties:

  compatible:

    enum:

      - lontium,lt9211



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  reset-gpios:

    maxItems: 1

    description: GPIO connected to active high RESET pin.



  vccio-supply:

    description: Regulator for 1.8V IO power.



  ports:

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



    properties:

      port@0:

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

        description:

          Primary MIPI DSI port-1 for MIPI input or

          LVDS port-1 for LVDS input or DPI input.



      port@1:

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

        description:

          Additional MIPI port-2 for MIPI input or LVDS port-2

          for LVDS input. Used in combination with primary

          port-1 to drive higher resolution displays



      port@2:

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

        description:

          Primary MIPI DSI port-1 for MIPI output or

          LVDS port-1 for LVDS output or DPI output.



      port@3:

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

        description:

          Additional MIPI port-2 for MIPI output or LVDS port-2

          for LVDS output. Used in combination with primary

          port-1 to drive higher resolution displays.



    required:

      - port@0

      - port@2



required:

  - compatible

  - reg

  - vccio-supply

  - ports



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/interrupt-controller/irq.h>



    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      hdmi-bridge@3b {

        compatible = "lontium,lt9211";

        reg = <0x3b>;



        reset-gpios = <&tlmm 128 GPIO_ACTIVE_HIGH>;

        interrupts-extended = <&tlmm 84 IRQ_TYPE_EDGE_FALLING>;



        vccio-supply = <&lt9211_1v8>;



        ports {

          #address-cells = <1>;

          #size-cells = <0>;



          port@0 {

            reg = <0>;



            endpoint {

              remote-endpoint = <&dsi0_out>;

            };

          };



          port@2 {

            reg = <2>;



            endpoint {

              remote-endpoint = <&panel_in_lvds>;

            };

          };

        };

      };

    };



...