kernel: bump 4.19 to 4.19.24
[openwrt/openwrt.git] / target / linux / kirkwood / patches-4.19 / 105-ea4500.patch
1 --- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
2 +++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
3 @@ -67,9 +67,23 @@
4 };
5 };
6
7 - dsa {
8 - status = "disabled";
9 + switches {
10 + #address-cells = <1>;
11 + #size-cells = <0>;
12
13 + mvsw61xx@10 {
14 + compatible = "marvell,88e6171";
15 + status = "okay";
16 + reg = <0x10>;
17 +
18 + mii-bus = <&mdio>;
19 + cpu-port-0 = <5>;
20 + cpu-port-1 = <6>;
21 + is-indirect;
22 + };
23 + };
24 +
25 + dsa {
26 compatible = "marvell,dsa";
27 #address-cells = <2>;
28 #size-cells = <0>;
29 @@ -161,22 +175,22 @@
30 };
31
32 partition@200000 {
33 - label = "kernel";
34 + label = "kernel1";
35 reg = <0x200000 0x2A0000>;
36 };
37
38 partition@4a0000 {
39 - label = "rootfs";
40 + label = "rootfs1";
41 reg = <0x4A0000 0x1760000>;
42 };
43
44 partition@1c00000 {
45 - label = "alt_kernel";
46 + label = "kernel2";
47 reg = <0x1C00000 0x2A0000>;
48 };
49
50 partition@1ea0000 {
51 - label = "alt_rootfs";
52 + label = "rootfs2";
53 reg = <0x1EA0000 0x1760000>;
54 };
55
56 @@ -207,53 +221,6 @@
57
58 &mdio {
59 status = "okay";
60 -
61 - switch@10 {
62 - compatible = "marvell,mv88e6085";
63 - #address-cells = <1>;
64 - #size-cells = <0>;
65 - reg = <16>;
66 -
67 - ports {
68 - #address-cells = <1>;
69 - #size-cells = <0>;
70 -
71 - port@0 {
72 - reg = <0>;
73 - label = "ethernet1";
74 - };
75 -
76 - port@1 {
77 - reg = <1>;
78 - label = "ethernet2";
79 - };
80 -
81 - port@2 {
82 - reg = <2>;
83 - label = "ethernet3";
84 - };
85 -
86 - port@3 {
87 - reg = <3>;
88 - label = "ethernet4";
89 - };
90 -
91 - port@4 {
92 - reg = <4>;
93 - label = "internet";
94 - };
95 -
96 - port@5 {
97 - reg = <5>;
98 - label = "cpu";
99 - ethernet = <&eth0port>;
100 - fixed-link {
101 - speed = <1000>;
102 - full-duplex;
103 - };
104 - };
105 - };
106 - };
107 };
108
109 &uart0 {
110 @@ -272,10 +239,14 @@
111 };
112
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.
116 */
117 &eth1 {
118 - status = "disabled";
119 + status = "okay";
120 + ethernet1-port@0 {
121 + speed = <1000>;
122 + duplex = <1>;
123 + };
124 };
125
126 /* There is no battery on the board, so the RTC does not keep