arm: Update dts to work with the new HDLCD driver

The dts files in system/arm/dt currently assume that an (unreleased)
gem5-specific virtual encoder is used as a remote endpoint for the
HDLCD. This driver won't be released as a more general virtual encoder
is about to be posted on the Linux DRI devel list and this encoder has
now been merged with gem5's kernel tree. This changeset updates gem5's
dts files to use that encoder.

Change-Id: Ic1a1be728efd31603752fdfba005b6dbdea42e7e
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Rene De Jong <rene.dejong@arm.com>

diff --git a/system/arm/dt/armv7.dts b/system/arm/dt/armv7.dts
index 9bd5b39a152c6f9123e4d8e5e90b689b26d3fd12..aea48444b72178e7bfee5eb6f8f3b07433d8ce75 100644 (file)
--- a/system/arm/dt/armv7.dts
+++ b/system/arm/dt/armv7.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited
+ * Copyright (c) 2015-2016 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@
        };
 
        virt-encoder {
-               compatible = "gem5,hdlcd-virt-encoder";
+               compatible = "drm,virtual-encoder";
                port {
                        hdlcd0_virt_input: endpoint@0 {
                                remote-endpoint = <&hdlcd0_output>;

diff --git a/system/arm/dt/armv8.dts b/system/arm/dt/armv8.dts
index 0cb5a8513cefd6631c24157dd777398b58314e71..9e07decbd52fbdedd3b19295d4d68f2449fe0504 100644 (file)
--- a/system/arm/dt/armv8.dts
+++ b/system/arm/dt/armv8.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited
+ * Copyright (c) 2015-2016 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,25 +108,40 @@
                #error Unsupported number of CPUs
                #endif
        };
+
+       virt-encoder {
+               compatible = "drm,virtual-encoder";
+               port {
+                       hdlcd0_virt_input: endpoint@0 {
+                               remote-endpoint = <&hdlcd0_output>;
+                       };
+               };
+
+               display-timings {
+                       native-mode = <&timing0>;
+
+                       timing0: timing_1080p60 {
+                               /* 1920x1080-60 */
+                               clock-frequency = <148500000>;
+                               hactive = <1920>;
+                               vactive = <1080>;
+                               hfront-porch = <148>;
+                               hback-porch = <88>;
+                               hsync-len = <44>;
+                               vfront-porch = <36>;
+                               vback-porch = <4>;
+                               vsync-len = <5>;
+                       };
+               };
+       };
 };
 
 &hdlcd0 {
        status = "ok";
 
-       display-timings {
-               native-mode = <&timing0>;
-
-               timing0: timing_1080p60 {
-                       /* 1920x1080-60 */
-                       clock-frequency = <148500>;
-                       hactive = <1920>;
-                       vactive = <1080>;
-                       hfront-porch = <148>;
-                       hback-porch = <88>;
-                       hsync-len = <44>;
-                       vfront-porch = <36>;
-                       vback-porch = <4>;
-                       vsync-len = <5>;
+       port {
+               hdlcd0_output: endpoint@0 {
+                       remote-endpoint = <&hdlcd0_virt_input>;
                };
        };
 };