FROMLIST: ARM: dts: rockchip: add eDP/panel display device nodes for rk3288-evb

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / vexpress-v2p-ca5s.dts

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index cf633ed6a1b485b2fd2c1d0cb6fa19b895fbd770..d2709b73316b20cb6a379be4cf9ac1aea136a039 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -9,8 +9,6 @@
 
 /dts-v1/;
 
-/memreserve/ 0xbf000000 0x01000000;
-
 / {
        model = "V2P-CA5s";
        arm,hbi = <0x225>;
@@ -61,8 +59,6 @@
                interrupts = <0 85 4>;
                clocks = <&oscclk3>;
                clock-names = "pxlclk";
-               mode = "640x480-16@60";
-               framebuffer = <0xbf000000 0x01000000>;
        };
 
        memory-controller@2a150000 {
@@ -92,6 +88,14 @@
                interrupts = <1 13 0x304>;
        };
 
+       timer@2c000200 {
+               compatible = "arm,cortex-a5-global-timer",
+                            "arm,cortex-a9-global-timer";
+               reg = <0x2c000200 0x20>;
+               interrupts = <1 11 0x304>;
+               clocks = <&oscclk0>;
+       };
+
        watchdog@2c000620 {
                compatible = "arm,cortex-a5-twd-wdt";
                reg = <0x2c000620 0x20>;
@@ -124,7 +128,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               osc@0 {
+               oscclk0: osc@0 {
                        /* CPU and internal AXI reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;