Skip to content

Commit

Permalink
Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org…
Browse files Browse the repository at this point in the history
…/drm/drm-misc into drm-next

drm-misc-next for 5.7:

UAPI Changes:
  - lima: Add support for heap buffers

Cross-subsystem Changes:

Core Changes:
  - Implement mode_config mode_valid for memory constrained drivers
  - Bus format negociation between bridges
  - Consolidate fake vblank events for drivers without vblank interrupts
  - drm/bufs: dma_alloc related cleanups
  - drm/dp_mst: Various fixes
  - drm/print: New drm_device based print helpers
  - Thomas is a drm-misc maintainer now!

Driver Changes:
  - DPMS cleanups for atomic drivers
  - Removal of owner field in SPI tinydrm drivers
  - Removal of explicit dependency on DT for tinydrm drivers
  - Conversion to YAML schemas for DT bindings
  - tidss: New driver
  - virtio: various reworks and fixes
  - Our usual dozen or so new panels or bridges

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200210093421.xu4sofldm6wm6xq6@gilmour.lan
  • Loading branch information
Dave Airlie committed Feb 20, 2020
2 parents 11a48a5 + 06f749a commit 1b245ec
Show file tree
Hide file tree
Showing 261 changed files with 11,248 additions and 1,833 deletions.
112 changes: 112 additions & 0 deletions Documentation/devicetree/bindings/display/bridge/ps8640.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/bridge/ps8640.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: MIPI DSI to eDP Video Format Converter Device Tree Bindings

maintainers:
- Nicolas Boichat <drinkcat@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
The PS8640 is a low power MIPI-to-eDP video format converter supporting
mobile devices with embedded panel resolutions up to 2048 x 1536. The
device accepts a single channel of MIPI DSI v1.1, with up to four lanes
plus clock, at a transmission rate up to 1.5Gbit/sec per lane. The
device outputs eDP v1.4, one or two lanes, at a link rate of up to
3.24Gbit/sec per lane.
properties:
compatible:
const: parade,ps8640

reg:
maxItems: 1
description: Base I2C address of the device.

powerdown-gpios:
maxItems: 1
description: GPIO connected to active low powerdown.

reset-gpios:
maxItems: 1
description: GPIO connected to active low reset.

vdd12-supply:
maxItems: 1
description: Regulator for 1.2V digital core power.

vdd33-supply:
maxItems: 1
description: Regulator for 3.3V digital core power.

ports:
type: object
description:
A node containing DSI input & output port nodes with endpoint
definitions as documented in
Documentation/devicetree/bindings/media/video-interfaces.txt
Documentation/devicetree/bindings/graph.txt
properties:
port@0:
type: object
description: |
Video port for DSI input
port@1:
type: object
description: |
Video port for eDP output (panel or connector).
required:
- port@0

required:
- compatible
- reg
- powerdown-gpios
- reset-gpios
- vdd12-supply
- vdd33-supply
- ports

additionalProperties: false

examples:
- |
#include <dt-bindings/gpio/gpio.h>
i2c0 {
#address-cells = <1>;
#size-cells = <0>;
ps8640: edp-bridge@18 {
compatible = "parade,ps8640";
reg = <0x18>;
powerdown-gpios = <&pio 116 GPIO_ACTIVE_LOW>;
reset-gpios = <&pio 115 GPIO_ACTIVE_LOW>;
vdd12-supply = <&ps8640_fixed_1v2>;
vdd33-supply = <&mt6397_vgp2_reg>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
ps8640_in: endpoint {
remote-endpoint = <&dsi0_out>;
};
};
port@1 {
reg = <1>;
ps8640_out: endpoint {
remote-endpoint = <&panel_in>;
};
};
};
};
};
73 changes: 73 additions & 0 deletions Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/ilitek,ili9486.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Ilitek ILI9486 display panels device tree bindings

maintainers:
- Kamlesh Gurudasani <kamlesh.gurudasani@gmail.com>

description:
This binding is for display panels using an Ilitek ILI9486 controller in SPI
mode.

allOf:
- $ref: panel/panel-common.yaml#

properties:
compatible:
items:
- enum:
# Waveshare 3.5" 320x480 Color TFT LCD
- waveshare,rpi-lcd-35
# Ozzmaker 3.5" 320x480 Color TFT LCD
- ozzmaker,piscreen
- const: ilitek,ili9486

spi-max-frequency:
maximum: 32000000

dc-gpios:
maxItems: 1
description: Display data/command selection (D/CX)

backlight: true
reg: true
reset-gpios: true
rotation: true

required:
- compatible
- reg
- dc-gpios
- reset-gpios

additionalProperties: false

examples:
- |
#include <dt-bindings/gpio/gpio.h>
backlight: backlight {
compatible = "gpio-backlight";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
};
spi {
#address-cells = <1>;
#size-cells = <0>;
display@0{
compatible = "waveshare,rpi-lcd-35", "ilitek,ili9486";
reg = <0>;
spi-max-frequency = <32000000>;
dc-gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
rotation = <180>;
backlight = <&backlight>;
};
};
...

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

29 changes: 0 additions & 29 deletions Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt

This file was deleted.

12 changes: 0 additions & 12 deletions Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt

This file was deleted.

12 changes: 0 additions & 12 deletions Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1b245ec

Please sign in to comment.