Skip to content

Commit 593e399

Browse files
halmartinrobimarko
authored andcommitted
ipq40xx/meraki: refactor common device tree
qcom-ipq4029-insect-common.dtsi was common to the MR33 and MR74, but was no longer common with the other supported Meraki devices. I have refactored insect-common and wired-qca-common into qcom-ipq4029-meraki-common.dtsi which contains the actual common components (e.g. NAND partitions, ART nvmem). Individual devices reference qcom-ipq4029-meraki-insect.dtsi plus their own individual configuration. Signed-off-by: Hal Martin <[email protected]> Link: openwrt/openwrt#20646 Signed-off-by: Robert Marko <[email protected]>
1 parent a0805af commit 593e399

File tree

7 files changed

+421
-239
lines changed

7 files changed

+421
-239
lines changed

target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-gx20.dts

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
// Device Tree Source for Meraki Go GX20 (Fairyfly)
33

4-
#include "qcom-ipq4029-wired-qca-common.dtsi"
4+
#include "qcom-ipq4029-meraki-insect.dtsi"
55

66
/ {
77
model = "Meraki Go GX20 Router";
88
compatible = "meraki,gx20";
99

10+
soc {
11+
ess_tcsr@1953000 {
12+
qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
13+
};
14+
15+
tcsr@194b000 {
16+
/* select hostmode */
17+
compatible = "qcom,tcsr";
18+
reg = <0x194b000 0x100>;
19+
qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
20+
status = "okay";
21+
};
22+
};
23+
1024
leds {
1125
compatible = "gpio-leds";
1226

@@ -99,11 +113,51 @@
99113
};
100114
};
101115

102-
/* GX20 does not have WiFi radios */
103-
&wifi0 {
104-
status = "disabled";
116+
&tricolor {
117+
enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
118+
};
119+
120+
&usb2_hs_phy {
121+
status = "okay";
122+
};
123+
124+
&usb2 {
125+
status = "okay";
126+
};
127+
128+
&usb3_hs_phy {
129+
status = "okay";
130+
};
131+
132+
&usb3_ss_phy {
133+
status = "okay";
134+
};
135+
136+
&usb3 {
137+
status = "okay";
138+
};
139+
140+
&swport1 {
141+
label = "wan";
142+
status = "okay";
143+
};
144+
145+
&swport2 {
146+
label = "lan2";
147+
status = "okay";
148+
};
149+
150+
&swport3 {
151+
label = "lan3";
152+
status = "okay";
153+
};
154+
155+
&swport4 {
156+
label = "lan4";
157+
status = "okay";
105158
};
106159

107-
&wifi1 {
108-
status = "disabled";
160+
&swport5 {
161+
label = "lan5";
162+
status = "okay";
109163
};

0 commit comments

Comments
 (0)