3 files changed, 71 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/xenvm-4.2.dts b/arch/arm/boot/dts/xenvm-4.2.dts
new file mode 100644
index 000000000000..ec3f9528e180
--- /dev/null
+++ b/arch/arm/boot/dts/xenvm-4.2.dts
@@ -0,0 +1,68 @@
+/*
+ * Xen Virtual Machine for unprivileged guests
+ *
+ * Based on ARM Ltd. Versatile Express CoreTile Express (single CPU)
+ * Cortex-A15 MPCore (V2P-CA15)
+ *
+ */
+
+/dts-v1/;
+
+/ {
+        model = "XENVM-4.2";
+        compatible = "xen,xenvm-4.2", "xen,xenvm";
+        interrupt-parent = <&gic>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        chosen {
+                /* this field is going to be adjusted by the hypervisor */
+                bootargs = "console=hvc0 root=/dev/xvda";
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a15";
+                        reg = <0>;
+                };
+        };
+
+        memory@80000000 {
+                device_type = "memory";
+                /* this field is going to be adjusted by the hypervisor */
+                reg = <0 0x80000000 0 0x08000000>;
+        };
+
+        gic: interrupt-controller@2c001000 {
+                compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0 0x2c001000 0 0x1000>,
+                      <0 0x2c002000 0 0x100>;
+        };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts = <1 13 0xf08>,
+                             <1 14 0xf08>,
+                             <1 11 0xf08>,
+                             <1 10 0xf08>;
+        };
+
+        hypervisor {
+                compatible = "xen,xen-4.2", "xen,xen";
+                /* this field is going to be adjusted by the hypervisor */
+                reg = <0 0xb0000000 0 0x20000>;
+                /* this field is going to be adjusted by the hypervisor */
+                interrupts = <1 15 0xf08>;
+        };
+
+        motherboard {
+                arm,v2m-memory-map = "rs1";
+        };
+};
diff --git a/arch/arm/mach-vexpress/Makefile.boot b/arch/arm/mach-vexpress/Makefile.boot
index 318d308dfb93..38dbaac63349 100644
--- a/arch/arm/mach-vexpress/Makefile.boot
+++ b/arch/arm/mach-vexpress/Makefile.boot
@@ -7,4 +7,5 @@ initrd_phys-y	:= 0x60800000
 dtb-$(CONFIG_ARCH_VEXPRESS_DT)  += vexpress-v2p-ca5s.dtb \
                                    vexpress-v2p-ca9.dtb \
                                    vexpress-v2p-ca15-tc1.dtb \
-                                   vexpress-v2p-ca15_a7.dtb
+                                   vexpress-v2p-ca15_a7.dtb \
+                                   xenvm-4.2.dtb
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 37608f22ee31..0a79b085ceaf 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -658,6 +658,7 @@ static void __init v2m_dt_init(void)
 
 const static char *v2m_dt_match[] __initconst = {
         "arm,vexpress",
+        "xen,xenvm",
         NULL,
 };