mediatek: more v5.4 fixes
[openwrt/staging/jow.git] / target / linux / mediatek / patches-4.14 / 0064-dts.patch
1 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
2 +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
3 @@ -21,6 +21,10 @@
4 stdout-path = "serial2:115200n8";
5 };
6
7 + memory {
8 + reg = <0 0x80000000 0 0x20000000>;
9 + };
10 +
11 cpus {
12 cpu@0 {
13 proc-supply = <&mt6323_vproc_reg>;
14 @@ -103,6 +107,10 @@
15 device_type = "memory";
16 reg = <0 0x80000000 0 0x40000000>;
17 };
18 +
19 + mt7530: switch@0 {
20 + compatible = "mediatek,mt7530";
21 + };
22 };
23
24 &cir {
25 @@ -130,11 +138,24 @@
26 };
27 };
28
29 + gmac1: mac@1 {
30 + compatible = "mediatek,eth-mac";
31 + reg = <1>;
32 + phy-mode = "rgmii";
33 +
34 + fixed-link {
35 + speed = <1000>;
36 + full-duplex;
37 + pause;
38 + };
39 + };
40 +
41 mdio: mdio-bus {
42 #address-cells = <1>;
43 #size-cells = <0>;
44 -
45 - switch@0 {
46 + };
47 +};
48 + &mt7530 {
49 compatible = "mediatek,mt7530";
50 #address-cells = <1>;
51 #size-cells = <0>;
52 @@ -144,6 +165,8 @@
53 core-supply = <&mt6323_vpa_reg>;
54 io-supply = <&mt6323_vemc3v3_reg>;
55
56 + dsa,mii-bus = <&mdio>;
57 +
58 ports {
59 #address-cells = <1>;
60 #size-cells = <0>;
61 @@ -152,29 +175,46 @@
62 port@0 {
63 reg = <0>;
64 label = "wan";
65 + cpu = <&cpu_port1>;
66 };
67
68 port@1 {
69 reg = <1>;
70 label = "lan0";
71 + cpu = <&cpu_port0>;
72 };
73
74 port@2 {
75 reg = <2>;
76 label = "lan1";
77 + cpu = <&cpu_port0>;
78 };
79
80 port@3 {
81 reg = <3>;
82 label = "lan2";
83 + cpu = <&cpu_port0>;
84 };
85
86 port@4 {
87 reg = <4>;
88 label = "lan3";
89 + cpu = <&cpu_port0>;
90 };
91
92 - port@6 {
93 + cpu_port1: port@5 {
94 + reg = <5>;
95 + label = "cpu";
96 + ethernet = <&gmac1>;
97 + phy-mode = "rgmii";
98 +
99 + fixed-link {
100 + speed = <1000>;
101 + full-duplex;
102 + };
103 + };
104 +
105 + cpu_port0: port@6 {
106 reg = <6>;
107 label = "cpu";
108 ethernet = <&gmac0>;
109 @@ -187,8 +227,6 @@
110 };
111 };
112 };
113 - };
114 -};
115
116 &i2c0 {
117 pinctrl-names = "default";
118 --- a/arch/arm/boot/dts/mt7623.dtsi
119 +++ b/arch/arm/boot/dts/mt7623.dtsi
120 @@ -326,6 +326,7 @@
121 "syscon";
122 reg = <0 0x10209000 0 0x1000>;
123 #clock-cells = <1>;
124 + #reset-cells = <1>;
125 };
126
127 rng: rng@1020f000 {