-
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 tag 'drm-misc-next-2023-10-27' of git://anongit.freedesktop.org…
…/drm/drm-misc into drm-next drm-misc-next for v6.7-rc1: drm-misc-next-2023-10-19 + following: UAPI Changes: Cross-subsystem Changes: - Convert fbdev drivers to use fbdev i/o mem helpers. Core Changes: - Use cross-references for macros in docs. - Make drm_client_buffer_addb use addfb2. - Add NV20 and NV30 YUV formats. - Documentation updates for create_dumb ioctl. - CI fixes. - Allow variable number of run-queues in scheduler. Driver Changes: - Rename drm/ast constants. - Make ili9882t its own driver. - Assorted fixes in ivpu, vc4, bridge/synopsis, amdgpu. - Add planar formats to rockchip. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/3d92fae8-9b1b-4165-9ca8-5fda11ee146b@linux.intel.com
- Loading branch information
Showing
192 changed files
with
4,684 additions
and
1,675 deletions.
There are no files selected for viewing
115 changes: 115 additions & 0 deletions
115
Documentation/devicetree/bindings/display/bridge/fsl,imx93-mipi-dsi.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,115 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/bridge/fsl,imx93-mipi-dsi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Freescale i.MX93 specific extensions to Synopsys Designware MIPI DSI | ||
|
||
maintainers: | ||
- Liu Ying <victor.liu@nxp.com> | ||
|
||
description: | | ||
There is a Synopsys Designware MIPI DSI Host Controller and a Synopsys | ||
Designware MIPI DPHY embedded in Freescale i.MX93 SoC. Some configurations | ||
and extensions to them are controlled by i.MX93 media blk-ctrl. | ||
allOf: | ||
- $ref: snps,dw-mipi-dsi.yaml# | ||
|
||
properties: | ||
compatible: | ||
const: fsl,imx93-mipi-dsi | ||
|
||
clocks: | ||
items: | ||
- description: apb clock | ||
- description: pixel clock | ||
- description: PHY configuration clock | ||
- description: PHY reference clock | ||
|
||
clock-names: | ||
items: | ||
- const: pclk | ||
- const: pix | ||
- const: phy_cfg | ||
- const: phy_ref | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
fsl,media-blk-ctrl: | ||
$ref: /schemas/types.yaml#/definitions/phandle | ||
description: | ||
i.MX93 media blk-ctrl, as a syscon, controls pixel component bit map | ||
configurations from LCDIF display controller to the MIPI DSI host | ||
controller and MIPI DPHY PLL related configurations through PLL SoC | ||
interface. | ||
|
||
power-domains: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- interrupts | ||
- fsl,media-blk-ctrl | ||
- power-domains | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/imx93-clock.h> | ||
#include <dt-bindings/gpio/gpio.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
#include <dt-bindings/power/fsl,imx93-power.h> | ||
dsi@4ae10000 { | ||
compatible = "fsl,imx93-mipi-dsi"; | ||
reg = <0x4ae10000 0x10000>; | ||
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&clk IMX93_CLK_MIPI_DSI_GATE>, | ||
<&clk IMX93_CLK_MEDIA_DISP_PIX>, | ||
<&clk IMX93_CLK_MIPI_PHY_CFG>, | ||
<&clk IMX93_CLK_24M>; | ||
clock-names = "pclk", "pix", "phy_cfg", "phy_ref"; | ||
fsl,media-blk-ctrl = <&media_blk_ctrl>; | ||
power-domains = <&media_blk_ctrl IMX93_MEDIABLK_PD_MIPI_DSI>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
panel@0 { | ||
compatible = "raydium,rm67191"; | ||
reg = <0>; | ||
reset-gpios = <&adp5585gpio 6 GPIO_ACTIVE_LOW>; | ||
dsi-lanes = <4>; | ||
video-mode = <2>; | ||
port { | ||
panel_in: endpoint { | ||
remote-endpoint = <&dsi_out>; | ||
}; | ||
}; | ||
}; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
dsi_to_lcdif: endpoint { | ||
remote-endpoint = <&lcdif_to_dsi>; | ||
}; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
dsi_out: endpoint { | ||
remote-endpoint = <&panel_in>; | ||
}; | ||
}; | ||
}; | ||
}; |
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
42 changes: 42 additions & 0 deletions
42
Documentation/devicetree/bindings/display/solomon,ssd-common.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,42 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/solomon,ssd-common.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Common properties for Solomon OLED Display Controllers | ||
|
||
maintainers: | ||
- Javier Martinez Canillas <javierm@redhat.com> | ||
|
||
properties: | ||
reg: | ||
maxItems: 1 | ||
|
||
reset-gpios: | ||
maxItems: 1 | ||
|
||
# Only required for SPI | ||
dc-gpios: | ||
description: | ||
GPIO connected to the controller's D/C# (Data/Command) pin, | ||
that is needed for 4-wire SPI to tell the controller if the | ||
data sent is for a command register or the display data RAM | ||
maxItems: 1 | ||
|
||
solomon,height: | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
description: | ||
Height in pixel of the screen driven by the controller. | ||
The default value is controller-dependent. | ||
|
||
solomon,width: | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
description: | ||
Width in pixel of the screen driven by the controller. | ||
The default value is controller-dependent. | ||
|
||
allOf: | ||
- $ref: /schemas/spi/spi-peripheral-props.yaml# | ||
|
||
additionalProperties: true |
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
89 changes: 89 additions & 0 deletions
89
Documentation/devicetree/bindings/display/solomon,ssd132x.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,89 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/solomon,ssd132x.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Solomon SSD132x OLED Display Controllers | ||
|
||
maintainers: | ||
- Javier Martinez Canillas <javierm@redhat.com> | ||
|
||
properties: | ||
compatible: | ||
- enum: | ||
- solomon,ssd1322 | ||
- solomon,ssd1325 | ||
- solomon,ssd1327 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
allOf: | ||
- $ref: solomon,ssd-common.yaml# | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: solomon,ssd1322 | ||
then: | ||
properties: | ||
width: | ||
default: 480 | ||
height: | ||
default: 128 | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: solomon,ssd1325 | ||
then: | ||
properties: | ||
width: | ||
default: 128 | ||
height: | ||
default: 80 | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: solomon,ssd1327 | ||
then: | ||
properties: | ||
width: | ||
default: 128 | ||
height: | ||
default: 128 | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
oled@3c { | ||
compatible = "solomon,ssd1327"; | ||
reg = <0x3c>; | ||
reset-gpios = <&gpio2 7>; | ||
}; | ||
}; | ||
- | | ||
spi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
oled@0 { | ||
compatible = "solomon,ssd1327"; | ||
reg = <0x0>; | ||
reset-gpios = <&gpio2 7>; | ||
dc-gpios = <&gpio2 8>; | ||
spi-max-frequency = <10000000>; | ||
}; | ||
}; |
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
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
Oops, something went wrong.