Merge drm/drm-next into drm-intel-next (69f06e4f) · Commits · EulixOS / Software / Kernel

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
		Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
		Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
		Maxime Ripard <mripard@kernel.org> <maxime@cerno.tech>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
		Mayuresh Janorkar <mayur@ti.com>

Documentation/devicetree/bindings/display/amlogic,meson-g12a-dw-mipi-dsi.yaml

0 → 100644

+118 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
		# Copyright 2020 BayLibre, SAS
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/display/amlogic,meson-g12a-dw-mipi-dsi.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Amlogic specific extensions to the Synopsys Designware MIPI DSI Host Controller

		maintainers:
		- Neil Armstrong <neil.armstrong@linaro.org>

		description: \|
		The Amlogic Meson Synopsys Designware Integration is composed of
		- A Synopsys DesignWare MIPI DSI Host Controller IP
		- A TOP control block controlling the Clocks & Resets of the IP

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

		properties:
		compatible:
		enum:
		- amlogic,meson-g12a-dw-mipi-dsi

		reg:
		maxItems: 1

		clocks:
		minItems: 3
		maxItems: 4

		clock-names:
		minItems: 3
		items:
		- const: pclk
		- const: bit
		- const: px
		- const: meas

		resets:
		maxItems: 1

		reset-names:
		items:
		- const: top

		phys:
		maxItems: 1

		phy-names:
		items:
		- const: dphy

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

		properties:
		port@0:
		$ref: /schemas/graph.yaml#/properties/port
		description: Input node to receive pixel data.

		port@1:
		$ref: /schemas/graph.yaml#/properties/port
		description: DSI output node to panel.

		required:
		- port@0
		- port@1

		required:
		- compatible
		- reg
		- clocks
		- clock-names
		- resets
		- reset-names
		- phys
		- phy-names
		- ports

		unevaluatedProperties: false

		examples:
		- \|
		dsi@6000 {
		compatible = "amlogic,meson-g12a-dw-mipi-dsi";
		reg = <0x6000 0x400>;
		resets = <&reset_top>;
		reset-names = "top";
		clocks = <&clk_pclk>, <&bit_clk>, <&clk_px>;
		clock-names = "pclk", "bit", "px";
		phys = <&mipi_dphy>;
		phy-names = "dphy";

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

		/* VPU VENC Input */
		mipi_dsi_venc_port: port@0 {
		reg = <0>;

		mipi_dsi_in: endpoint {
		remote-endpoint = <&dpi_out>;
		};
		};

		/* DSI Output */
		mipi_dsi_panel_port: port@1 {
		reg = <1>;

		mipi_out_panel: endpoint {
		remote-endpoint = <&mipi_in_panel>;
		};
		};
		};
		};

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,11 @@ properties:
		description:
		A port node pointing to the HDMI-TX port node.

		port@2:
		$ref: /schemas/graph.yaml#/properties/port
		description:
		A port node pointing to the DPI port node (e.g. DSI or LVDS transceiver).

		"#address-cells":
		const: 1

Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml

+7 −5

Original line number	Diff line number	Diff line
		@@ -70,7 +70,9 @@ properties:
		samsung,burst-clock-frequency:
		$ref: /schemas/types.yaml#/definitions/uint32
		description:
		DSIM high speed burst mode frequency.
		DSIM high speed burst mode frequency. If absent,
		the pixel clock from the attached device or bridge
		will be used instead.

		samsung,esc-clock-frequency:
		$ref: /schemas/types.yaml#/definitions/uint32
		@@ -80,7 +82,8 @@ properties:
		samsung,pll-clock-frequency:
		$ref: /schemas/types.yaml#/definitions/uint32
		description:
		DSIM oscillator clock frequency.
		DSIM oscillator clock frequency. If absent, the clock frequency
		of sclk_mipi will be used instead.

		phys:
		maxItems: 1
		@@ -100,7 +103,8 @@ properties:
		specified.

		port@1:
		$ref: /schemas/graph.yaml#/properties/port
		$ref: /schemas/graph.yaml#/$defs/port-base
		unevaluatedProperties: false
		description:
		DSI output port node to the panel or the next bridge
		in the chain.
		@@ -134,9 +138,7 @@ required:
		- compatible
		- interrupts
		- reg
		- samsung,burst-clock-frequency
		- samsung,esc-clock-frequency
		- samsung,pll-clock-frequency

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

Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ properties:
		maxItems: 1
		description: virtual channel number of a DSI peripheral

		reset-gpios:
		maxItems: 1

		vddc-supply:
		description: Regulator for 1.2V internal core power.