Unverified Commit 8664e763 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

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



Need to sync some header include that propagated through
drm-intel-next.

v2: After some changes in drm/drm-next

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 33991ae8 541b1b0a

Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ properties: 
      - innolux,hj110iz-01a

        # STARRY 2081101QFH032011-53G 10.1" WUXGA TFT LCD panel

      - starry,2081101qfh032011-53g

        # STARRY himax83102-j02 10.51" WUXGA TFT LCD panel

      - starry,himax83102-j02

        # STARRY ili9882t 10.51" WUXGA TFT LCD panel

      - starry,ili9882t

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

0 → 100644
+77 −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,hx83102.yaml#

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



title: Himax HX83102 MIPI-DSI LCD panel controller



maintainers:

  - Cong Yang <yangcong5@huaqin.corp-partner.google.com>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    items:

      - enum:

          # Boe nv110wum-l60 11.0" WUXGA TFT LCD panel

          - boe,nv110wum-l60

          # IVO t109nw41 11.0" WUXGA TFT LCD panel

          - ivo,t109nw41

          # STARRY himax83102-j02 10.51" WUXGA TFT LCD panel

          - starry,himax83102-j02

      - const: himax,hx83102



  reg:

    description: the virtual channel number of a DSI peripheral



  enable-gpios:

    description: a GPIO spec for the enable pin



  pp1800-supply:

    description: core voltage supply



  avdd-supply:

    description: phandle of the regulator that provides positive voltage



  avee-supply:

    description: phandle of the regulator that provides negative voltage



  backlight: true

  port: true

  rotation: true



required:

  - compatible

  - reg

  - enable-gpios

  - pp1800-supply

  - avdd-supply

  - avee-supply



additionalProperties: false



examples:

  - |

    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        panel@0 {

            compatible = "starry,himax83102-j02", "himax,hx83102";

            reg = <0>;

            enable-gpios = <&pio 45 0>;

            avdd-supply = <&ppvarn_lcd>;

            avee-supply = <&ppvarp_lcd>;

            pp1800-supply = <&pp1800_lcd>;

            backlight = <&backlight_lcd0>;

            port {

                panel_in: endpoint {

                    remote-endpoint = <&dsi_out>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/panel/panel-edp-legacy.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/panel/panel-edp-legacy.yaml#

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



title: Legacy eDP panels from before the "edp-panel" compatible



maintainers:

  - Douglas Anderson <dianders@chromium.org>



description: |

  This binding file is a collection of eDP panels from before the generic

  "edp-panel" compatible was introduced. It is kept around to support old

  dts files. The only reason one might add a new panel here instead of using

  the generic "edp-panel" is if it needed to be used on an eDP controller

  that doesn't support the generic "edp-panel" compatible, but it should be

  a strong preference to add the generic "edp-panel" compatible instead.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    enum:

    # compatible must be listed in alphabetical order, ordered by compatible.

    # The description in the comment is mandatory for each compatible.



        # AU Optronics Corporation 10.1" WSVGA TFT LCD panel

      - auo,b101ean01

        # AUO B116XAK01 eDP TFT LCD panel

      - auo,b116xa01

        # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel

      - auo,b133htn01

        # AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel

      - auo,b133xtn01

        # BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel

      - boe,nv101wxmn51

        # BOE NV133FHM-N61 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv110wtm-n61

        # BOE NV110WTM-N61 11.0" 2160x1440 TFT LCD Panel

      - boe,nv133fhm-n61

        # BOE NV133FHM-N62 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv133fhm-n62

        # BOE NV140FHM-N49 14.0" FHD a-Si FT panel

      - boe,nv140fhmn49

        # Innolux Corporation 11.6" WXGA (1366x768) TFT LCD panel

      - innolux,n116bca-ea1

        # Innolux Corporation 11.6" WXGA (1366x768) TFT LCD panel

      - innolux,n116bge

        # InnoLux 13.3" FHD (1920x1080) eDP TFT LCD panel

      - innolux,n125hce-gn1

        # Innolux P120ZDG-BF1 12.02 inch eDP 2K display panel

      - innolux,p120zdg-bf1

        # King & Display KD116N21-30NV-A010 eDP TFT LCD panel

      - kingdisplay,kd116n21-30nv-a010

        # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel

      - lg,lp079qx1-sp0v

        # LG 9.7" (2048x1536 pixels) TFT LCD panel

      - lg,lp097qx1-spa1

        # LG 12.0" (1920x1280 pixels) TFT LCD panel

      - lg,lp120up1

        # LG 12.9" (2560x1700 pixels) TFT LCD panel

      - lg,lp129qe

        # NewEast Optoelectronics CO., LTD WJFH116008A eDP TFT LCD panel

      - neweast,wjfh116008a

        # Samsung 12.2" (2560x1600 pixels) TFT LCD panel

      - samsung,lsn122dl01-c01

        # Samsung Electronics 14" WXGA (1366x768) TFT LCD panel

      - samsung,ltn140at29-301

        # Sharp LD-D5116Z01B 12.3" WUXGA+ eDP panel

      - sharp,ld-d5116z01b

        # Sharp 12.3" (2400x1600 pixels) TFT LCD panel

      - sharp,lq123p1jx31



  backlight: true

  ddc-i2c-bus: true

  enable-gpios: true

  panel-timing: true

  port: true

  power-supply: true

  no-hpd: true

  hpd-gpios: true



additionalProperties: false



required:

  - compatible

  - power-supply



examples:

  - |

    panel: panel {

      compatible = "innolux,n116bge";

      power-supply = <&panel_regulator>;

      backlight = <&backlight>;



      panel-timing {

        clock-frequency = <74250000>;

        hactive = <1366>;

        hfront-porch = <136>;

        hback-porch = <60>;

        hsync-len = <30>;

        hsync-active = <0>;

        vactive = <768>;

        vfront-porch = <8>;

        vback-porch = <12>;

        vsync-len = <12>;

        vsync-active = <0>;

      };



      port {

        panel_in_edp: endpoint {

          remote-endpoint = <&edp_out_panel>;

        };

      };

    };

Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml

+30 −0
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ description: | 
      |        Command or data         |

      |<D7><D6><D5><D4><D3><D2><D1><D0>|



  The standard defines one pixel format for type C: RGB111. The industry

  however has decided to provide the type A/B interface pixel formats also on

  the Type C interface and most common among these are RGB565 and RGB666.

  The MIPI DCS command set_address_mode (36h) has one bit that controls RGB/BGR

  order. This gives each supported RGB format a BGR variant.



  The panel resolution is specified using the panel-timing node properties

  hactive (width) and vactive (height). The other mandatory panel-timing

  properties should be set to zero except clock-frequency which can be
@@ -93,6 +99,28 @@ properties: 


  spi-3wire: true



  format:

    description: >

      Pixel format in bit order as going on the wire:

        * `x2r1g1b1r1g1b1` - RGB111, 2 pixels per byte

        * `x2b1g1r1b1g1r1` - BGR111, 2 pixels per byte

        * `x1r1g1b1x1r1g1b1` - RGB111, 2 pixels per byte

        * `x1b1g1r1x1b1g1r1` - BGR111, 2 pixels per byte

        * `r5g6b5` - RGB565, 2 bytes

        * `b5g6r5` - BGR565, 2 bytes

        * `r6x2g6x2b6x2` - RGB666, 3 bytes

        * `b6x2g6x2r6x2` - BGR666, 3 bytes

    enum:

      - x2r1g1b1r1g1b1

      - x2b1g1r1b1g1r1

      - x1r1g1b1x1r1g1b1

      - x1b1g1r1x1b1g1r1

      - r5g6b5

      - b5g6r5

      - r6x2g6x2b6x2

      - b6x2g6x2r6x2

    default: r5g6b5



required:

  - compatible

  - reg
@@ -119,6 +147,8 @@ examples: 
            reset-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

            write-only;



            format = "r5g6b5";



            backlight = <&backlight>;



            width-mm = <35>;

Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ properties: 
      - auo,g190ean01

        # Kaohsiung Opto-Electronics Inc. 10.1" WUXGA (1920 x 1200) LVDS TFT LCD panel

      - koe,tx26d202vm0bwa

        # Lincoln Technology Solutions, LCD185-101CT 10.1" TFT 1920x1200

      - lincolntech,lcd185-101ct

        # Microtips Technology MF-101HIEBCAF0 10.1" WUXGA (1920x1200) TFT LCD panel

      - microtips,mf-101hiebcaf0

        # Microtips Technology MF-103HIEB0GA0 10.25" 1920x720 TFT LCD panel

      - microtips,mf-103hieb0ga0

        # NLT Technologies, Ltd. 15.6" FHD (1920x1080) LVDS TFT LCD panel

      - nlt,nl192108ac18-02d