1 --- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
2 +++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
10 + #address-cells = <1>;
14 + compatible = "marvell,88e6171";
26 compatible = "marvell,dsa";
35 reg = <0x200000 0x2A0000>;
41 reg = <0x4A0000 0x1760000>;
45 - label = "alt_kernel";
47 reg = <0x1C00000 0x2A0000>;
51 - label = "alt_rootfs";
53 reg = <0x1EA0000 0x1760000>;
62 - compatible = "marvell,mv88e6085";
63 - #address-cells = <1>;
68 - #address-cells = <1>;
73 - label = "ethernet1";
78 - label = "ethernet2";
83 - label = "ethernet3";
88 - label = "ethernet4";
99 - ethernet = <ð0port>;
110 @@ -272,10 +239,14 @@
113 /* eth1 is connected to the switch at port 6. However DSA only supports a
114 - * single CPU port. So leave this port disabled to avoid confusion.
115 + * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
118 - status = "disabled";
126 /* There is no battery on the board, so the RTC does not keep