patch dtb-xen

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index ac870fb3fa0d459b6639e5965f9cc2daecae14e2..d6d3c47b951d7a781c82d12b48b3c1808a321ab3 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -47,7 +47,7 @@
                };
 
                ethernet@2,02000000 {
-                       compatible = "smsc,lan9118", "smsc,lan9115";
+                       compatible = "smsc,lan91c111";
                        reg = <2 0x02000000 0x10000>;
                        interrupts = <15>;
                        phy-mode = "mii";

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index a3d37ec2655d80efccae49ee9f85ca9c9b1213b1..468642b63cbbf65f6e5ded9a1ff3bab4746069aa 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -18,8 +18,10 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       chosen { };
-
+       chosen {
+                 bootargs = "dom0_mem=128M dom0_max_vcpus=1 console=com1,vga";
+                 xen,dom0-bootargs = "earlyprintk=xenboot console=ttyAMA1 root=/dev/mmcblk0 debug rw init=/bin/bash";
+       };
        aliases {
                serial0 = &v2m_serial0;
                serial1 = &v2m_serial1;
@@ -38,17 +40,19 @@
                        compatible = "arm,cortex-a15";
                        reg = <0>;
                };
-
-               cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a15";
-                       reg = <1>;
-               };
        };
 
        memory@80000000 {
                device_type = "memory";
-               reg = <0 0x80000000 0 0x40000000>;
+               reg = <0 0x80000000 0 0x80000000>;
+       };
+
+       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>;
        };
 
        hdlcd@2b000000 {
@@ -59,13 +63,6 @@
                clock-names = "pxlclk";
        };
 
-       memory-controller@2b0a0000 {
-               compatible = "arm,pl341", "arm,primecell";
-               reg = <0 0x2b0a0000 0 0x1000>;
-               clocks = <&oscclk7>;
-               clock-names = "apb_pclk";
-       };
-
        wdt@2b060000 {
                compatible = "arm,sp805", "arm,primecell";
                status = "disabled";
@@ -87,26 +84,6 @@
                interrupts = <1 9 0xf04>;
        };
 
-       memory-controller@7ffd0000 {
-               compatible = "arm,pl354", "arm,primecell";
-               reg = <0 0x7ffd0000 0 0x1000>;
-               interrupts = <0 86 4>,
-                            <0 87 4>;
-               clocks = <&oscclk7>;
-               clock-names = "apb_pclk";
-       };
-
-       dma@7ffb0000 {
-               compatible = "arm,pl330", "arm,primecell";
-               reg = <0 0x7ffb0000 0 0x1000>;
-               interrupts = <0 92 4>,
-                            <0 88 4>,
-                            <0 89 4>,
-                            <0 90 4>,
-                            <0 91 4>;
-               clocks = <&oscclk7>;
-               clock-names = "apb_pclk";
-       };
 
        timer {
                compatible = "arm,armv7-timer";

diff --git a/arch/arm/boot/dts/xenvm-4.2.dts b/arch/arm/boot/dts/xenvm-4.2.dts
index ec3f9528e180c75e42b633104fb537ced0762691..7a2cf307c5cf89e3038b66d8165092d9e5a178aa 100644 (file)
--- a/arch/arm/boot/dts/xenvm-4.2.dts
+++ b/arch/arm/boot/dts/xenvm-4.2.dts
@@ -17,7 +17,7 @@
 
        chosen {
                /* this field is going to be adjusted by the hypervisor */
-               bootargs = "console=hvc0 root=/dev/xvda";
+               bootargs = "earlyprintk=xenboot console=hvc0 root=/dev/xvda debug rw init=/bin/sh";
        };
 
        cpus {