mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
9808b9ae02
Add patches-4.9, some of them (heavily) rewritten: - ea4500 is upstream available, keep only LEDE changes in dts - ea3500 is changed to match the structure of the upstream ea4500 dts - nsa310s rewritten to include the common dtsi - nsa325 is dropped, since already upstream Signed-off-by: Paul Wassi <p.wassi@gmx.at> Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it> [refresh kernel config, add on100, use the switchdev based mv88e6171 driver for the linksys boards, keep lede specific rootfs/kernel partition names for linksys boards, reorder patches] Signed-off-by: Mathias Kresin <dev@kresin.me>
65 lines
1.3 KiB
Diff
65 lines
1.3 KiB
Diff
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
|
|
@@ -69,6 +69,17 @@
|
|
};
|
|
};
|
|
|
|
+ mvsw61xx {
|
|
+ compatible = "marvell,88e6171";
|
|
+ status = "okay";
|
|
+ reg = <0x10>;
|
|
+
|
|
+ mii-bus = <&mdio>;
|
|
+ cpu-port-0 = <5>;
|
|
+ cpu-port-1 = <6>;
|
|
+ is-indirect;
|
|
+ };
|
|
+
|
|
dsa {
|
|
compatible = "marvell,dsa";
|
|
#address-cells = <2>;
|
|
@@ -161,22 +172,22 @@
|
|
};
|
|
|
|
partition@200000 {
|
|
- label = "kernel";
|
|
+ label = "kernel1";
|
|
reg = <0x200000 0x2A0000>;
|
|
};
|
|
|
|
partition@4A0000 {
|
|
- label = "rootfs";
|
|
+ label = "rootfs1";
|
|
reg = <0x4A0000 0x1760000>;
|
|
};
|
|
|
|
partition@1C00000 {
|
|
- label = "alt_kernel";
|
|
+ label = "kernel2";
|
|
reg = <0x1C00000 0x2A0000>;
|
|
};
|
|
|
|
partition@1EA0000 {
|
|
- label = "alt_rootfs";
|
|
+ label = "rootfs2";
|
|
reg = <0x1EA0000 0x1760000>;
|
|
};
|
|
|
|
@@ -225,10 +236,14 @@
|
|
};
|
|
|
|
/* eth1 is connected to the switch at port 6. However DSA only supports a
|
|
- * single CPU port. So leave this port disabled to avoid confusion.
|
|
+ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
|
|
*/
|
|
ð1 {
|
|
- status = "disabled";
|
|
+ status = "okay";
|
|
+ ethernet1-port@0 {
|
|
+ speed = <1000>;
|
|
+ duplex = <1>;
|
|
+ };
|
|
};
|
|
|
|
/* There is no battery on the board, so the RTC does not keep
|