Merge branch 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vexpress-v2p-ca9.dts

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 62d9b225dcceec8b27464027cd9dba60640c33f5..23662b5a5e9d84554f34eb0fc3edad1ef029f4e6 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -70,9 +70,40 @@
        clcd@10020000 {
                compatible = "arm,pl111", "arm,primecell";
                reg = <0x10020000 0x1000>;
+               interrupt-names = "combined";
                interrupts = <0 44 4>;
                clocks = <&oscclk1>, <&oscclk2>;
                clock-names = "clcdclk", "apb_pclk";
+               max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
+
+               port {
+                       clcd_pads: endpoint {
+                               remote-endpoint = <&clcd_panel>;
+                               arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
+                       };
+               };
+
+               panel {
+                       compatible = "panel-dpi";
+
+                       port {
+                               clcd_panel: endpoint {
+                                       remote-endpoint = <&clcd_pads>;
+                               };
+                       };
+
+                       panel-timing {
+                               clock-frequency = <63500127>;
+                               hactive = <1024>;
+                               hback-porch = <152>;
+                               hfront-porch = <48>;
+                               hsync-len = <104>;
+                               vactive = <768>;
+                               vback-porch = <23>;
+                               vfront-porch = <3>;
+                               vsync-len = <4>;
+                       };
+               };
        };
 
        memory-controller@100e0000 {