Commit d527353e authored by Jani Nikula's avatar Jani Nikula
Browse files

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



Sync up with topic/i915-gem-next and drm-intel-gt-next.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents 70bfb307 9c0fed84
Loading
Loading
Loading
Loading
+18 −0
Original line number Original line Diff line number Diff line
@@ -567,6 +567,24 @@ For printing netdev_features_t.


Passed by reference.
Passed by reference.


V4L2 and DRM FourCC code (pixel format)
---------------------------------------

::

	%p4cc

Print a FourCC code used by V4L2 or DRM, including format endianness and
its numerical value as hexadecimal.

Passed by reference.

Examples::

	%p4cc	BG12 little-endian (0x32314742)
	%p4cc	Y10  little-endian (0x20303159)
	%p4cc	NV12 big-endian (0xb231564e)

Thanks
Thanks
======
======


+2 −2
Original line number Original line Diff line number Diff line
@@ -12,8 +12,8 @@ description: |
  and CEC.
  and CEC.


  These DT bindings follow the Synopsys DWC HDMI TX bindings defined
  These DT bindings follow the Synopsys DWC HDMI TX bindings defined
  in Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with
  in bridge/synopsys,dw-hdmi.yaml with the following device-specific
  the following device-specific properties.
  properties.


maintainers:
maintainers:
  - Chen-Yu Tsai <wens@csie.org>
  - Chen-Yu Tsai <wens@csie.org>
+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ required:
  - resets
  - resets
  - ddc
  - ddc


additionalProperties: false
unevaluatedProperties: false


examples:
examples:
  - |
  - |
+15 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,15 @@ properties:
    description: used for reset chip control, RESET_N pin B7.
    description: used for reset chip control, RESET_N pin B7.
    maxItems: 1
    maxItems: 1


  vdd10-supply:
    description: Regulator that provides the supply 1.0V power.

  vdd18-supply:
    description: Regulator that provides the supply 1.8V power.

  vdd33-supply:
    description: Regulator that provides the supply 3.3V power.

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


@@ -55,6 +64,9 @@ properties:
required:
required:
  - compatible
  - compatible
  - reg
  - reg
  - vdd10-supply
  - vdd18-supply
  - vdd33-supply
  - ports
  - ports


additionalProperties: false
additionalProperties: false
@@ -72,6 +84,9 @@ examples:
            reg = <0x58>;
            reg = <0x58>;
            enable-gpios = <&pio 45 GPIO_ACTIVE_HIGH>;
            enable-gpios = <&pio 45 GPIO_ACTIVE_HIGH>;
            reset-gpios = <&pio 73 GPIO_ACTIVE_HIGH>;
            reset-gpios = <&pio 73 GPIO_ACTIVE_HIGH>;
            vdd10-supply = <&pp1000_mipibrdg>;
            vdd18-supply = <&pp1800_mipibrdg>;
            vdd33-supply = <&pp3300_mipibrdg>;


            ports {
            ports {
                #address-cells = <1>;
                #address-cells = <1>;
+99 −0
Original line number Original line 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/chipone,icn6211.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Chipone ICN6211 MIPI-DSI to RGB Converter bridge

maintainers:
  - Jagan Teki <jagan@amarulasolutions.com>

description: |
  ICN6211 is MIPI-DSI to RGB Converter bridge from chipone.

  It has a flexible configuration of MIPI DSI signal input and
  produce RGB565, RGB666, RGB888 output format.

properties:
  compatible:
    enum:
      - chipone,icn6211

  reg:
    maxItems: 1
    description: virtual channel number of a DSI peripheral

  enable-gpios:
    description: Bridge EN pin, chip is reset when EN is low.

  vdd1-supply:
    description: A 1.8V/2.5V/3.3V supply that power the MIPI RX.

  vdd2-supply:
    description: A 1.8V/2.5V/3.3V supply that power the PLL.

  vdd3-supply:
    description: A 1.8V/2.5V/3.3V supply that power the RGB output.

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

    properties:
      port@0:
        $ref: /schemas/graph.yaml#/properties/port
        description:
          Video port for MIPI DSI input

      port@1:
        $ref: /schemas/graph.yaml#/properties/port
        description:
          Video port for MIPI DPI output (panel or connector).

    required:
      - port@0
      - port@1

required:
  - compatible
  - reg
  - enable-gpios
  - ports

additionalProperties: false

examples:
  - |
    #include <dt-bindings/gpio/gpio.h>

    dsi {
      #address-cells = <1>;
      #size-cells = <0>;

      bridge@0 {
        compatible = "chipone,icn6211";
        reg = <0>;
        enable-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */

        ports {
          #address-cells = <1>;
          #size-cells = <0>;

          port@0 {
            reg = <0>;

            bridge_in_dsi: endpoint {
              remote-endpoint = <&dsi_out_bridge>;
            };
          };

          port@1 {
            reg = <1>;

            bridge_out_panel: endpoint {
              remote-endpoint = <&panel_out_bridge>;
            };
          };
        };
      };
    };
Loading