Skip to content

Commit

Permalink
Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next…
Browse files Browse the repository at this point in the history
…-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag

Core:
- MSM_INFO_GET_FLAGS support
- Cleaned up MSM IOMMU wrapper code

DPU:
- Added support for XR30 and P010 image formats
- Reworked MDSS/DPU schema, added SM8250 MDSS bindings
- Added Qualcomm SM6115 support

DP:
- Dropped unsane sanity checks

DSI:
- Fix calculation of DSC pps payload

DSI PHY:
- DSI PHY support for QCM2290

HDMI:
- Reworked dev init path

And, as usual, small misc fixes.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  • Loading branch information
Dmitry Baryshkov committed Nov 26, 2022
6 parents 822ff99 + 3581b70 + d3c1a86 + c541556 + ad51705 + 5d8c041 commit 8d1d17d
Show file tree
Hide file tree
Showing 42 changed files with 3,338 additions and 1,516 deletions.
52 changes: 52 additions & 0 deletions Documentation/devicetree/bindings/display/msm/dpu-common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/msm/dpu-common.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Qualcomm Display DPU common properties

maintainers:
- Krishna Manikandan <quic_mkrishn@quicinc.com>
- Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
- Rob Clark <robdclark@gmail.com>

description: |
Common properties for QCom DPU display controller.
properties:
interrupts:
maxItems: 1

power-domains:
maxItems: 1

operating-points-v2: true
opp-table:
type: object

ports:
$ref: /schemas/graph.yaml#/properties/ports
description: |
Contains the list of output ports from DPU device. These ports
connect to interfaces that are external to the DPU hardware,
such as DSI, DP etc.
patternProperties:
"^port@[0-9a-f]+$":
$ref: /schemas/graph.yaml#/properties/port

# at least one port is required
required:
- port@0

required:
- compatible
- reg
- reg-names
- clocks
- interrupts
- power-domains
- operating-points-v2
- ports

additionalProperties: true
223 changes: 0 additions & 223 deletions Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml

This file was deleted.

Loading

0 comments on commit 8d1d17d

Please sign in to comment.