Skip to content

Commit 314dbb7

Browse files
achterinrobimarko
authored andcommitted
ipq40xx: split orbi devices in router and satellite
Netgear Orbi devices are split into router and satellite units. Even though the hardware is mostly the same, the network configuration is different. Router units have a designated WAN port while satellite units have all available ports labeled as "Ethernet". This splits the device trees into both unit types and adjusts the port labels. Signed-off-by: Christoph Krapp <achterin@gmail.com> Link: openwrt/openwrt#20877 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 4e688db commit 314dbb7

File tree

10 files changed

+65
-37
lines changed

10 files changed

+65
-37
lines changed

target/linux/ipq40xx/base-files/etc/board.d/02_network

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ ipq40xx_setup_interfaces()
7070
buffalo,wtr-m2133hp|\
7171
ezviz,cs-w3-wd1200g-eup|\
7272
netgear,rbr40|\
73-
netgear,rbs40|\
7473
netgear,rbr50|\
75-
netgear,rbs50|\
76-
netgear,srr60|\
77-
netgear,srs60)
74+
netgear,srr60)
7875
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
7976
;;
80-
avm,fritzbox-7530)
77+
avm,fritzbox-7530|\
78+
netgear,rbs40|\
79+
netgear,rbs50|\
80+
netgear,srs60)
8181
ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
8282
;;
8383
avm,fritzrepeater-3000|\
@@ -245,9 +245,7 @@ ipq40xx_setup_macs()
245245
label_mac="$lan_mac"
246246
;;
247247
netgear,rbr50|\
248-
netgear,rbs50|\
249248
netgear,srr60|\
250-
netgear,srs60|\
251249
pakedge,wr-1)
252250
wan_mac=$(macaddr_add $(get_mac_label) 1)
253251
;;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
3+
#include "qcom-ipq4019-orbi.dtsi"
4+
5+
&swport1 {
6+
status = "okay";
7+
8+
label = "wan";
9+
};
10+
11+
&swport2 {
12+
status = "okay";
13+
14+
label = "lan1";
15+
};
16+
17+
&swport3 {
18+
status = "okay";
19+
20+
label = "lan2";
21+
};
22+
23+
&swport4 {
24+
status = "okay";
25+
26+
label = "lan3";
27+
};
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
3+
#include "qcom-ipq4019-orbi.dtsi"
4+
5+
&swport1 {
6+
status = "okay";
7+
8+
label = "lan1";
9+
};
10+
11+
&swport2 {
12+
status = "okay";
13+
14+
label = "lan2";
15+
};
16+
17+
&swport3 {
18+
status = "okay";
19+
20+
label = "lan3";
21+
};
22+
23+
&swport4 {
24+
status = "okay";
25+
26+
label = "lan4";
27+
};

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -278,30 +278,6 @@
278278
status = "okay";
279279
};
280280

281-
&swport1 {
282-
status = "okay";
283-
284-
label = "wan";
285-
};
286-
287-
&swport2 {
288-
status = "okay";
289-
290-
label = "lan1";
291-
};
292-
293-
&swport3 {
294-
status = "okay";
295-
296-
label = "lan2";
297-
};
298-
299-
&swport4 {
300-
status = "okay";
301-
302-
label = "lan3";
303-
};
304-
305281
&ethphy4 {
306282
status = "disabled";
307283
};

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-router.dtsi"
44

55
/ {
66
model = "NETGEAR RBR40";

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-router.dtsi"
44

55
/ {
66
model = "NETGEAR RBR50";

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-satellite.dtsi"
44

55
/ {
66
model = "NETGEAR RBS40";

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-satellite.dtsi"
44

55
/ {
66
model = "NETGEAR RBS50";

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-router.dtsi"
44

55
/ {
66
model = "NETGEAR SRR60";

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22

3-
#include "qcom-ipq4019-orbi.dtsi"
3+
#include "qcom-ipq4019-orbi-satellite.dtsi"
44

55
/ {
66
model = "NETGEAR SRS60";

0 commit comments

Comments
 (0)