-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge drm/drm-next into drm-intel-next
Sync up with topic/i915-gem-next and drm-intel-gt-next. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
- Loading branch information
Showing
1,500 changed files
with
162,960 additions
and
16,370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -109,7 +109,7 @@ required: | |
- resets | ||
- ddc | ||
|
||
additionalProperties: false | ||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
# 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>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; |
33 changes: 0 additions & 33 deletions
33
Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
This file was deleted.
Oops, something went wrong.
102 changes: 102 additions & 0 deletions
102
Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/bridge/lontium,lt8912b.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Lontium LT8912B MIPI to HDMI Bridge | ||
|
||
maintainers: | ||
- Adrien Grassein <adrien.grassein@gmail.com> | ||
|
||
description: | | ||
The LT8912B is a bridge device which convert DSI to HDMI | ||
properties: | ||
compatible: | ||
enum: | ||
- lontium,lt8912b | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
reset-gpios: | ||
maxItems: 1 | ||
description: GPIO connected to active high RESET pin. | ||
|
||
ports: | ||
$ref: /schemas/graph.yaml#/properties/ports | ||
|
||
properties: | ||
port@0: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: | ||
Primary MIPI port for MIPI input | ||
|
||
properties: | ||
endpoint: | ||
$ref: /schemas/media/video-interfaces.yaml# | ||
unevaluatedProperties: false | ||
|
||
properties: | ||
data-lanes: true | ||
|
||
required: | ||
- data-lanes | ||
|
||
port@1: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: | | ||
HDMI port, should be connected to a node compatible with the | ||
hdmi-connector binding. | ||
required: | ||
- port@0 | ||
- port@1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- reset-gpios | ||
- ports | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/gpio/gpio.h> | ||
i2c4 { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
hdmi-bridge@48 { | ||
compatible = "lontium,lt8912b"; | ||
reg = <0x48>; | ||
reset-gpios = <&max7323 0 GPIO_ACTIVE_LOW>; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
hdmi_out_in: endpoint { | ||
data-lanes = <0 1 2 3>; | ||
remote-endpoint = <&mipi_dsi_out>; | ||
}; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
endpoint { | ||
remote-endpoint = <&hdmi_in>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; | ||
... |
Oops, something went wrong.