aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/patches-4.19/105-ea4500.patch
blob: 4c3c82bdfd9cbfa3ebcf89cea9492cb2fb589028 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
@@ -24,6 +24,10 @@
 	};
 
 	aliases {
+		led-boot = &led_white_health;
+		led-failsafe = &led_white_health;
+		led-running = &led_white_health;
+		led-upgrade = &led_white_health;
 		serial0 = &uart0;
 	};
 
@@ -56,9 +60,10 @@
 		pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
 		pinctrl-names = "default";
 
-		white-health {
+		led_white_health: white-health {
 			label = "viper:white:health";
 			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
 		};
 
 		white-pulse {
@@ -67,9 +72,18 @@
 		};
 	};
 
-	dsa {
-		status = "disabled";
+	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>;
 		#size-cells = <0>;
@@ -161,22 +175,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>;
 		};
 
@@ -207,53 +221,6 @@
 
 &mdio {
 	status = "okay";
-
-	switch@10 {
-		compatible = "marvell,mv88e6085";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <16>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-				label = "ethernet1";
-			};
-
-			port@1 {
-				reg = <1>;
-				label = "ethernet2";
-			};
-
-			port@2 {
-				reg = <2>;
-				label = "ethernet3";
-			};
-
-			port@3 {
-				reg = <3>;
-				label = "ethernet4";
-			};
-
-			port@4 {
-				reg = <4>;
-				label = "internet";
-			};
-
-			port@5 {
-				reg = <5>;
-				label = "cpu";
-				ethernet = <&eth0port>;
-				fixed-link {
-					speed = <1000>;
-					full-duplex;
-				};
-			};
-		};
-	};
 };
 
 &uart0 {
@@ -272,10 +239,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.
  */
 &eth1 {
-	status = "disabled";
+	status = "okay";
+	ethernet1-port@0 {
+		speed = <1000>;
+		duplex = <1>;
+	};
 };
 
 /* There is no battery on the board, so the RTC does not keep