These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / emev2-kzm9d.dts

diff --git a/kernel/arch/arm/boot/dts/emev2-kzm9d.dts b/kernel/arch/arm/boot/dts/emev2-kzm9d.dts
index 1944627..8c24975 100644 (file)
--- a/kernel/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/kernel/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -35,28 +35,28 @@
 
                button@1 {
                        debounce_interval = <50>;
-                       wakeup = <1>;
+                       wakeup-source;
                        label = "DSW2-1";
                        linux,code = <KEY_1>;
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };
                button@2 {
                        debounce_interval = <50>;
-                       wakeup = <1>;
+                       wakeup-source;
                        label = "DSW2-2";
                        linux,code = <KEY_2>;
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
                button@3 {
                        debounce_interval = <50>;
-                       wakeup = <1>;
+                       wakeup-source;
                        label = "DSW2-3";
                        linux,code = <KEY_3>;
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                };
                button@4 {
                        debounce_interval = <50>;
-                       wakeup = <1>;
+                       wakeup-source;
                        label = "DSW2-4";
                        linux,code = <KEY_4>;
                        gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
@@ -81,7 +81,7 @@
                regulator-boot-on;
        };
 
-       lan9220@20000000 {
+       ethernet@20000000 {
                compatible = "smsc,lan9220", "smsc,lan9115";
                reg = <0x20000000 0x10000>;
                phy-mode = "mii";
@@ -95,8 +95,16 @@
        };
 };
 
+&iic0 {
+       status = "okay";
+};
+
+&iic1 {
+       status = "okay";
+};
+
 &pfc {
-       uart1_pins: uart@e1030000 {
+       uart1_pins: serial@e1030000 {
                renesas,groups = "uart1_ctrl", "uart1_data";
                renesas,function = "uart1";
        };