]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Tue, 17 Mar 2020 08:29:11 +0000 (09:29 +0100)
committerMaxime Ripard <maxime@cerno.tech>
Tue, 17 Mar 2020 08:29:11 +0000 (09:29 +0100)
Jernej needs some patches that got merged in -rc5.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
1  2 
Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml
Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

index 2c9b8aa34815a40543f0e117ebbf78988aae6c3f,a614644c9849dfa96836caa6850f14618126f12e..fd931b29381670bcf271f926b9543522f06d260c
@@@ -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>;
index 39ec7ae525addf5ee8db395fc35393b825693fb9,22c91beb054103d197f4c16e487b264ca5f7ddd5..d9fdb58e06b4218bc1db4d2b9b8534085903f336
@@@ -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>;