diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:06:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:06:56 +1000 |
| commit | ab3d8479626d281f43db0d41b8e36f6a9bd9980a (patch) | |
| tree | 779a421a2659ddec0d34992804138e3e101857ad /Documentation | |
| parent | 91c93e475ca4b4bd5f1e8d525c9a9810283db056 (diff) | |
| parent | b9578c49456340ca4d3c7ddbaca054ffc2b51bc1 (diff) | |
| download | lwn-ab3d8479626d281f43db0d41b8e36f6a9bd9980a.tar.gz lwn-ab3d8479626d281f43db0d41b8e36f6a9bd9980a.zip | |
Merge tag 'drm-misc-next-2024-06-20' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.11:
UAPI Changes:
- New monochrome TV mode variant
Cross-subsystem Changes:
- dma heaps: Change slightly the allocation hook prototype
Core Changes:
Driver Changes:
- ivpu: various improvements over firmware handling, clocks, power
management, scheduling and logging.
- mgag200: Add BMC output, enable polling
- panfrost: Enable MT8188 support
- tidss: drm_panic support
- zynqmp_dp: IRQ cleanups, debugfs DP compliance testing API
- bridge:
- sii902x: state validation improvements
- panel:
- edp: Drop legacy panel compatibles
- simple-bridge: Switch to devm_drm_bridge_add
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240620-heretic-honored-macaque-b40f8a@houat
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml | 10 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml b/Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml index 9e5864de49e7..b308047c1edf 100644 --- a/Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml +++ b/Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml @@ -31,13 +31,9 @@ properties: # AUO B116XAK01 eDP TFT LCD panel - auo,b116xa01 # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel - - auo,b133han05 - # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel - auo,b133htn01 # AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel - auo,b133xtn01 - # AU Optronics Corporation 14.0" FHD (1920x1080) color TFT-LCD panel - - auo,b140han06 # BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel - boe,nv101wxmn51 # BOE NV133FHM-N61 13.3" FHD (1920x1080) TFT LCD Panel @@ -56,8 +52,6 @@ properties: - innolux,n125hce-gn1 # Innolux P120ZDG-BF1 12.02 inch eDP 2K display panel - innolux,p120zdg-bf1 - # InfoVision Optoelectronics M133NWF4 R0 13.3" FHD (1920x1080) TFT LCD panel - - ivo,m133nwf4-r0 # King & Display KD116N21-30NV-A010 eDP TFT LCD panel - kingdisplay,kd116n21-30nv-a010 # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel @@ -78,10 +72,6 @@ properties: - sharp,ld-d5116z01b # Sharp 12.3" (2400x1600 pixels) TFT LCD panel - sharp,lq123p1jx31 - # Sharp 14" (1920x1080 pixels) TFT LCD panel - - sharp,lq140m1jw46 - # Starry 12.2" (1920x1200 pixels) TFT LCD panel - - starry,kr122ea0sra backlight: true ddc-i2c-bus: true diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml index e796a1ff8c82..278399adc550 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +++ b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml @@ -34,6 +34,7 @@ properties: - const: arm,mali-valhall-jm # Mali Valhall GPU model/revision is fully discoverable - items: - enum: + - mediatek,mt8188-mali - mediatek,mt8192-mali - const: arm,mali-valhall-jm # Mali Valhall GPU model/revision is fully discoverable @@ -195,7 +196,9 @@ allOf: properties: compatible: contains: - const: mediatek,mt8183b-mali + enum: + - mediatek,mt8183b-mali + - mediatek,mt8188-mali then: properties: power-domains: |