Commit 902ecddc authored by Jani Nikula's avatar Jani Nikula
Browse files

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



Backmerge to get the EDID handling changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents 81f66500 68de345e

.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/cdns,dsi.txt

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
Cadence DSI bridge

==================



The Cadence DSI bridge is a DPI to DSI bridge supporting up to 4 DSI lanes.



Required properties:

- compatible: should be set to "cdns,dsi".

- reg: physical base address and length of the controller's registers.

- interrupts: interrupt line connected to the DSI bridge.

- clocks: DSI bridge clocks.

- clock-names: must contain "dsi_p_clk" and "dsi_sys_clk".

- phys: phandle link to the MIPI D-PHY controller.

- phy-names: must contain "dphy".

- #address-cells: must be set to 1.

- #size-cells: must be set to 0.



Optional properties:

- resets: DSI reset lines.

- reset-names: can contain "dsi_p_rst".



Required subnodes:

- ports: Ports as described in Documentation/devicetree/bindings/graph.txt.

  2 ports are available:

  * port 0: this port is only needed if some of your DSI devices are

	    controlled through  an external bus like I2C or SPI. Can have at

	    most 4 endpoints. The endpoint number is directly encoding the

	    DSI virtual channel used by this device.

  * port 1: represents the DPI input.

  Other ports will be added later to support the new kind of inputs.



- one subnode per DSI device connected on the DSI bus. Each DSI device should

  contain a reg property encoding its virtual channel.



Example:

	dsi0: dsi@fd0c0000 {

		compatible = "cdns,dsi";

		reg = <0x0 0xfd0c0000 0x0 0x1000>;

		clocks = <&pclk>, <&sysclk>;

		clock-names = "dsi_p_clk", "dsi_sys_clk";

		interrupts = <1>;

		phys = <&dphy0>;

		phy-names = "dphy";

		#address-cells = <1>;

		#size-cells = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				reg = <1>;

				dsi0_dpi_input: endpoint {

					remote-endpoint = <&xxx_dpi_output>;

				};

			};

		};



		panel: dsi-dev@0 {

			compatible = "<vendor,panel>";

			reg = <0>;

		};

	};



or



	dsi0: dsi@fd0c0000 {

		compatible = "cdns,dsi";

		reg = <0x0 0xfd0c0000 0x0 0x1000>;

		clocks = <&pclk>, <&sysclk>;

		clock-names = "dsi_p_clk", "dsi_sys_clk";

		interrupts = <1>;

		phys = <&dphy1>;

		phy-names = "dphy";

		#address-cells = <1>;

		#size-cells = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <0>;



				dsi0_output: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&dsi_panel_input>;

				};

			};



			port@1 {

				reg = <1>;

				dsi0_dpi_input: endpoint {

					remote-endpoint = <&xxx_dpi_output>;

				};

			};

		};

	};



	i2c@xxx {

		panel: panel@59 {

			compatible = "<vendor,panel>";

			reg = <0x59>;



			port {

				dsi_panel_input: endpoint {

					remote-endpoint = <&dsi0_output>;

				};

			};

		};

	};

Documentation/devicetree/bindings/display/bridge/cdns,dsi.yaml

0 → 100644
+180 −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/bridge/cdns,dsi.yaml#

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



title: Cadence DSI bridge



maintainers:

  - Boris Brezillon <boris.brezillon@bootlin.com>



description: |

   CDNS DSI is a bridge device which converts DPI to DSI



properties:

  compatible:

    enum:

      - cdns,dsi

      - ti,j721e-dsi



  reg:

    minItems: 1

    items:

      - description:

          Register block for controller's registers.

      - description:

          Register block for wrapper settings registers in case of TI J7 SoCs.



  clocks:

    items:

      - description: PSM clock, used by the IP

      - description: sys clock, used by the IP



  clock-names:

    items:

      - const: dsi_p_clk

      - const: dsi_sys_clk



  phys:

    maxItems: 1



  phy-names:

    const: dphy



  interrupts:

    maxItems: 1



  resets:

    maxItems: 1



  reset-names:

    const: dsi_p_rst



  ports:

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



    properties:

      port@0:

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

        description:

          Output port representing the DSI output. It can have

          at most 4 endpoints. The endpoint number is directly encoding

          the DSI virtual channel used by this device.



      port@1:

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

        description:

          Input port representing the DPI input.



    required:

      - port@1



allOf:

  - $ref: ../dsi-controller.yaml#



  - if:

      properties:

        compatible:

          contains:

            const: ti,j721e-dsi

    then:

      properties:

        reg:

          minItems: 2

          maxItems: 2

        power-domains:

          maxItems: 1

    else:

      properties:

        reg:

          maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - phys

  - phy-names

  - ports



unevaluatedProperties: false



examples:

  - |

    bus {

        #address-cells = <2>;

        #size-cells = <2>;



        dsi@fd0c0000 {

            compatible = "cdns,dsi";

            reg = <0x0 0xfd0c0000 0x0 0x1000>;

            clocks = <&pclk>, <&sysclk>;

            clock-names = "dsi_p_clk", "dsi_sys_clk";

            interrupts = <1>;

            phys = <&dphy0>;

            phy-names = "dphy";



            #address-cells = <1>;

            #size-cells = <0>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@1 {

                    reg = <1>;

                    endpoint {

                        remote-endpoint = <&xxx_dpi_output>;

                    };

                };

            };



            panel@0 {

                compatible = "panasonic,vvx10f034n00";

                reg = <0>;

                power-supply = <&vcc_lcd_reg>;

            };

        };

    };



  - |

    bus {

        #address-cells = <2>;

        #size-cells = <2>;



        dsi@fd0c0000 {

            compatible = "cdns,dsi";

            reg = <0x0 0xfd0c0000 0x0 0x1000>;

            clocks = <&pclk>, <&sysclk>;

            clock-names = "dsi_p_clk", "dsi_sys_clk";

            interrupts = <1>;

            phys = <&dphy1>;

            phy-names = "dphy";



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    #address-cells = <1>;

                    #size-cells = <0>;



                    endpoint@0 {

                        reg = <0>;

                        remote-endpoint = <&dsi_panel_input>;

                    };

                };



                port@1 {

                    reg = <1>;

                    endpoint {

                        remote-endpoint = <&xxx_dpi_output>;

                    };

                };

            };

        };

    };

Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml

+15 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ description: | 


properties:

  compatible:

    const: fsl,imx8mp-ldb

    enum:

      - fsl,imx8mp-ldb

      - fsl,imx93-ldb



  clocks:

    maxItems: 1
@@ -57,6 +59,18 @@ required: 
  - clocks

  - ports



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx93-ldb

    then:

      properties:

        ports:

          properties:

            port@2: false



additionalProperties: false



examples:

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>;

                    };

                };

            };

        };