Commit 126a3406 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2020-04-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.8:

UAPI Changes:

Cross-subsystem Changes:

 * MAINTAINERS: adapt several filenames to changes in panel code
 * arch/arm, fbdev: Use GPIO descriptors in sa11x0
 * dma-buf: Fix typo in documentation

Core Changes:

 * drm: Don't free framebuffer in drm_gem_fb_init()
 * drm: Document struct drm_device.dev_private being deprecated
 * drm: Merged topic/phy-compliance-202004-08

Driver Changes:

 * drm/adv7511: Add support for HDMI SPDIF and additional sampling rates
 * drm/ast: Allocate CRTC state of correct size
 * drm/panel: convert many driver bindings to DT schema; add port/ports property
          to bindings
 * drm/rockchip: Convert rk3066 bindings to YAML; spelling fixes
 * fbdev/arcfb: Call request_irq(), free_irq() at appropriate places
 * fbdev/controlfb: Support COMPILE_TEST; cleanups
 * fbdev/imxfb: Fix unbalanced enables/disables
 * fbdev/s1d13xxxfb: Call unregister_framebuffer()
 * fbdev/ssd1307fb: Use atomic PWM API, device properties and probe_new();
                    cleanups
 * fbdev/vesafb: Call release_region()
 * cleanups of includes, unused types/variables/fields, and fallthrough

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200423083425.GA15883@linux-uq9g
parents 1aa63ddf 776d5882

Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ examples: 
        panel@0 {

                compatible = "bananapi,lhr050h41", "ilitek,ili9881c";

                reg = <0>;

                power-gpios = <&pio 1 7 0>; /* PB07 */

                power-supply = <&reg_display>;

                reset-gpios = <&r_pio 0 5 1>; /* PL05 */

                backlight = <&pwm_bl>;

        };

Documentation/devicetree/bindings/display/dsi-controller.yaml

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ description: | 


properties:

  $nodename:

    pattern: "^dsi-controller(@.*)?$"

    pattern: "^dsi(@.*)?$"



  "#address-cells":

    const: 1
@@ -76,7 +76,7 @@ patternProperties: 
examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    dsi-controller@a0351000 {

    dsi@a0351000 {

        reg = <0xa0351000 0x1000>;

        #address-cells = <1>;

        #size-cells = <0>;

Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
ARM Versatile TFT Panels



These panels are connected to the daughterboards found on the

ARM Versatile reference designs.



This device node must appear as a child to a "syscon"-compatible

node.



Required properties:

- compatible: should be "arm,versatile-tft-panel"



Required subnodes:

- port: see display/panel/panel-common.yaml, graph.txt





Example:



sysreg@0 {

	compatible = "arm,versatile-sysreg", "syscon", "simple-mfd";

	reg = <0x00000 0x1000>;



	panel: display@0 {

		compatible = "arm,versatile-tft-panel";



		port {

			panel_in: endpoint {

				remote-endpoint = <&foo>;

			};

		};

	};

};

Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/arm,versatile-tft-panel.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ARM Versatile TFT Panels



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



description: |

  These panels are connected to the daughterboards found on the

  ARM Versatile reference designs.



  This device node must appear as a child to a "syscon"-compatible

  node.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: arm,versatile-tft-panel



  port: true



required:

  - compatible

  - port



additionalProperties: false



examples:

  - |

    sysreg {

        compatible = "arm,versatile-sysreg", "syscon", "simple-mfd";

        reg = <0x00000 0x1000>;



        #address-cells = <1>;

        #size-cells = <0>;



        panel {

            compatible = "arm,versatile-tft-panel";



            port {

                panel_in: endpoint {

                    remote-endpoint = <&foo>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Boe Himax8279d 1200x1920 TFT LCD panel



Required properties:

- compatible: should be "boe,himax8279d8p" and one of: "boe,himax8279d10p"

- reg: DSI virtual channel of the peripheral

- enable-gpios: panel enable gpio

- pp33-gpios: a GPIO phandle for the 3.3v pin that provides the supply voltage

- pp18-gpios: a GPIO phandle for the 1.8v pin that provides the supply voltage



Optional properties:

- backlight: phandle of the backlight device attached to the panel



Example:



	&mipi_dsi {

		panel {

			compatible = "boe,himax8279d8p", "boe,himax8279d10p";

			reg = <0>;

			backlight = <&backlight>;

			enable-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;

			pp33-gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;

			pp18-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE