diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-04-23 09:48:56 +0300 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-04-23 09:48:56 +0300 |
commit | c058e7a8f8af355e4a441c89400a6e95a16320e5 (patch) | |
tree | ed96dcd06e69f508a3f8a112a29fd228289429a6 /Documentation/devicetree/bindings/display | |
parent | 6221deb716b9d5397c09ba6567f7ae61d8cbeb98 (diff) | |
parent | 0208ca55aa9c9b997da1f5bc45c4e98916323f08 (diff) | |
download | linux-c058e7a8f8af355e4a441c89400a6e95a16320e5.tar.xz |
Merge drm/drm-next into drm-misc-next
MaĆra needs a backmerge to apply v3d patches, and Danilo for some
nouveau patches.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/display')
-rw-r--r-- | Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml index c0d6a4fdff97..e6dc5494baee 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml @@ -53,6 +53,15 @@ patternProperties: compatible: const: qcom,sm8150-dpu + "^displayport-controller@[0-9a-f]+$": + type: object + additionalProperties: true + + properties: + compatible: + contains: + const: qcom,sm8150-dp + "^dsi@[0-9a-f]+$": type: object additionalProperties: true |