patch vexpress_machine

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index d6d3c47b951d7a781c82d12b48b3c1808a321ab3..672c264bdf4f2c71989c475f3d2721191ff67ac6 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,lan91c111";
+                       compatible = "smsc,lan9118", "smsc,lan9115";
                        reg = <2 0x02000000 0x10000>;
                        interrupts = <15>;
                        phy-mode = "mii";
@@ -137,14 +137,6 @@
                                clock-names = "KMIREFCLK", "apb_pclk";
                        };
 
-                       v2m_serial0: uart@090000 {
-                               compatible = "arm,pl011", "arm,primecell";
-                               reg = <0x090000 0x1000>;
-                               interrupts = <5>;
-                               clocks = <&v2m_oscclk2>, <&smbclk>;
-                               clock-names = "uartclk", "apb_pclk";
-                       };
-
                        v2m_serial1: uart@0a0000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x0a0000 0x1000>;

diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index f1420368355bb2f91715526d4a057660f5480b71..db86e85e3fcef8153619e3858addaee80cd3113f 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -136,14 +136,6 @@
                                clock-names = "KMIREFCLK", "apb_pclk";
                        };
 
-                       v2m_serial0: uart@09000 {
-                               compatible = "arm,pl011", "arm,primecell";
-                               reg = <0x09000 0x1000>;
-                               interrupts = <5>;
-                               clocks = <&v2m_oscclk2>, <&smbclk>;
-                               clock-names = "uartclk", "apb_pclk";
-                       };
-
                        v2m_serial1: uart@0a000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x0a000 0x1000>;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 468642b63cbbf65f6e5ded9a1ff3bab4746069aa..36423ba0c9fa2bf9ccc8dcc5a18b06b85caf030c 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -23,7 +23,6 @@
                  xen,dom0-bootargs = "earlyprintk=xenboot console=ttyAMA1 root=/dev/mmcblk0 debug rw init=/bin/bash";
        };
        aliases {
-               serial0 = &v2m_serial0;
                serial1 = &v2m_serial1;
                serial2 = &v2m_serial2;
                serial3 = &v2m_serial3;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 1fc405a9ecfb0a4e6cacd94ba9442d6ce75575fa..a8b47a60202a96f4c576e9663326157a4e591e47 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -21,7 +21,6 @@
        chosen { };
 
        aliases {
-               serial0 = &v2m_serial0;
                serial1 = &v2m_serial1;
                serial2 = &v2m_serial2;
                serial3 = &v2m_serial3;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index 6328cbc71d3005931fecb40a796bcedd8c61ce1f..0d23e48a739c092bb8e7764d63221f9c33b38adf 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -21,7 +21,6 @@
        chosen { };
 
        aliases {
-               serial0 = &v2m_serial0;
                serial1 = &v2m_serial1;
                serial2 = &v2m_serial2;
                serial3 = &v2m_serial3;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 1420bb14d95c9bdeecea3aff5598612df359b924..ac2d59adb7d8dd61c656488c513028ddf35ac3f4 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -21,7 +21,6 @@
        chosen { };
 
        aliases {
-               serial0 = &v2m_serial0;
                serial1 = &v2m_serial1;
                serial2 = &v2m_serial2;
                serial3 = &v2m_serial3;

diff --git a/arch/arm/boot/dts/xenvm-4.2.dts b/arch/arm/boot/dts/xenvm-4.2.dts
index 7a2cf307c5cf89e3038b66d8165092d9e5a178aa..c0a506bf0345596e8f9bce90c59b03d738465ed7 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 = "earlyprintk=xenboot console=hvc0 root=/dev/xvda debug rw init=/bin/sh";
+               bootargs = "earlyprintk=xenboot,keep console=hvc0 root=/dev/xvda debug rw init=/bin/sh";
        };
 
        cpus {