[PATCH 2/2] devicetree/bindings: display: Merge panel.txt with panel-common.txt

[Laurent Pinchart]

The two files were added concurrently and both store common panel
properties. Merge them together.

Suggested-by: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
---
 .../devicetree/bindings/display/panel/panel-common.txt      | 6 ++++++
 Documentation/devicetree/bindings/display/panel/panel.txt   | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt

diff --git a/Documentation/devicetree/bindings/display/panel/panel-common.txt b/Documentation/devicetree/bindings/display/panel/panel-common.txt
index 5d2519af4bb5..cd9d94189d43 100644
--- a/Documentation/devicetree/bindings/display/panel/panel-common.txt
+++ b/Documentation/devicetree/bindings/display/panel/panel-common.txt
@@ -18,6 +18,12 @@ Descriptive Properties
   physical area where images are displayed. These properties are expressed in
   millimeters and rounded to the closest unit.
 
+- rotation: Panels are commonly mounted rotated, with their native orientation
+  not aligned with the device's orientation. The rotation property specifies
+  the angle in degrees between the panel's orientation and the device's
+  orientation (corresponding to a counter-clockwise rotation of the panel).
+  Valid values are  0, 90, 180 and 270.
+
 - label: The label property specifies a symbolic name for the panel as a
   string suitable for use by humans. It typically contains a name inscribed on
   the system (e.g. as an affixed label) or specified in the system's
diff --git a/Documentation/devicetree/bindings/display/panel/panel.txt b/Documentation/devicetree/bindings/display/panel/panel.txt
deleted file mode 100644
index e2e6867852b8..000000000000
--- a/Documentation/devicetree/bindings/display/panel/panel.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Common display properties
--------------------------
-
-- rotation:	Display rotation in degrees counter clockwise (0,90,180,270)
-- 
Regards,

Laurent Pinchart