From: Maxime Ripard <maxime@cerno.tech>
Date: Tue, 17 Mar 2020 08:29:11 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=51b8479ab20ba3804348824c63abdb3f35b0aaeb;p=linux.git

Merge drm/drm-next into drm-misc-next

Jernej needs some patches that got merged in -rc5.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

51b8479ab20ba3804348824c63abdb3f35b0aaeb
diff --cc Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml
index 2c9b8aa34815a,a614644c9849d..fd931b2938167
--- a/Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml
+++ b/Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml
@@@ -34,9 -34,11 +34,11 @@@ additionalProperties: fals
  
  examples:
    - |
 -    dsi@ff450000 {
 +    dsi {
          #address-cells = <1>;
          #size-cells = <0>;
+         reg = <0xff450000 0x1000>;
+ 
          panel@0 {
              compatible = "leadtek,ltk500hd1829";
              reg = <0>;
diff --cc Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
index 39ec7ae525add,22c91beb05410..d9fdb58e06b42
--- a/Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
+++ b/Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
@@@ -34,9 -34,11 +34,11 @@@ additionalProperties: fals
  
  examples:
    - |
 -    dsi@ff450000 {
 +    dsi {
          #address-cells = <1>;
          #size-cells = <0>;
+         reg = <0xff450000 0x1000>;
+ 
          panel@0 {
              compatible = "xinpeng,xpp055c272";
              reg = <0>;