Skip to content

Commit 3d61975

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: Update README.md ipq60xx: add network setting and sysupgrade for 360v6 ipq60xx: splite Qihoo 360v6 dts file
2 parents a49586c + 5ae0cbf commit 3d61975

File tree

6 files changed

+238
-14
lines changed

6 files changed

+238
-14
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
## 官方讨论群
66
如有技术问题需要讨论或者交流，欢迎加入以下群：
7-
1. QQ 讨论群： Op固件技术研究群 ,号码 891659613 ，加群链接：[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群")
7+
1. QQ 讨论群： Op固件技术研究群-2 号码 618992230 ,加群链接：[点击加入](https://jq.qq.com/?_wv=1027&k=Imt01vqy "Op固件技术研究群-2")
8+
Op固件技术研究群 ,号码 891659613 ，加群链接：[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群")
89
2. TG 讨论群： OP 编译官方大群 ，加群链接：[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群")
910
3. Rockchip RK3568 预编译固件发布 Release 下载更新地址 (包括 H68K )：<https://github.com/coolsnowwolf/lede/releases/tag/20220716>
1011

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ setup_network()
77

88
case $(board_name) in
99
cmiot,ax18|\
10+
qihoo,v6|\
1011
zn,m2)
1112
ucidef_set_interfaces_lan_wan "eth1 eth2 eth3" "eth0"
1213
;;

‎target/linux/ipq60xx/base-files/lib/upgrade/platform.sh

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ platform_do_upgrade() {
9393
linksys_do_upgrade "$1"
9494
;;
9595
cmiot,ax18|\
96+
qihoo,v6|\
9697
zn,m2)
9798
nand_do_upgrade "$1"
9899
;;

‎target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-v6.dts

+208
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
// SPDX-License-Identifier: (GPL-2.0+)
2+
3+
/dts-v1/;
4+
5+
#include "ipq6018.dtsi"
6+
#include "ipq6018-upstreamable.dtsi"
7+
#include "ipq6018-ess.dtsi"
8+
9+
#include <dt-bindings/input/input.h>
10+
#include <dt-bindings/gpio/gpio.h>
11+
12+
/ {
13+
model = "Qihoo 360 V6";
14+
compatible = "qihoo,v6", "qcom,ipq6018";
15+
16+
aliases {
17+
serial0 = &blsp1_uart3;
18+
// led-boot = &led_power;
19+
// led-failsafe = &led_power;
20+
// led-running = &led_power;
21+
// led-upgrade = &led_power;
22+
};
23+
24+
chosen {
25+
stdout-path = "serial0:115200n8";
26+
};
27+
28+
keys {
29+
compatible = "gpio-keys";
30+
31+
reset {
32+
label = "reset";
33+
gpios = <&tlmm 68 GPIO_ACTIVE_LOW>;
34+
linux,code = <KEY_RESTART>;
35+
};
36+
37+
wps {
38+
label = "reset";
39+
gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
40+
linux,code = <KEY_WPS_BUTTON>;
41+
};
42+
};
43+
};
44+
45+
&blsp1_uart3 {
46+
pinctrl-0 = <&serial_3_pins>;
47+
pinctrl-names = "default";
48+
status = "okay";
49+
};
50+
51+
&tlmm {
52+
53+
mdio_pins: mdio-pins {
54+
mdc {
55+
pins = "gpio64";
56+
function = "mdc";
57+
drive-strength = <8>;
58+
bias-pull-up;
59+
};
60+
61+
mdio {
62+
pins = "gpio65";
63+
function = "mdio";
64+
drive-strength = <8>;
65+
bias-pull-up;
66+
};
67+
};
68+
};
69+
70+
&soc {
71+
dp1: dp@1 {
72+
compatible = "qcom,nss-dp";
73+
reg = <0x0 0x3a001000 0x0 0x200>;
74+
qcom,mactype = <0>;
75+
qcom,id = <1>;
76+
77+
phy-handle = <&phy_0>;
78+
phy-mode = "sgmii";
79+
};
80+
81+
dp2 {
82+
compatible = "qcom,nss-dp";
83+
reg = <0x0 0x3a001200 0x0 0x200>;
84+
qcom,mactype = <0>;
85+
qcom,id = <2>;
86+
87+
phy-handle = <&phy_1>;
88+
phy-mode = "sgmii";
89+
};
90+
91+
dp3 {
92+
compatible = "qcom,nss-dp";
93+
reg = <0x0 0x3a001400 0x0 0x200>;
94+
qcom,mactype = <0>;
95+
qcom,id = <3>;
96+
97+
phy-handle = <&phy_2>;
98+
phy-mode = "sgmii";
99+
};
100+
101+
dp4 {
102+
compatible = "qcom,nss-dp";
103+
reg = <0x0 0x3a001600 0x0 0x200>;
104+
qcom,mactype = <0>;
105+
qcom,id = <4>;
106+
107+
phy-handle = <&phy_3>;
108+
phy-mode = "sgmii";
109+
};
110+
111+
dp5 {
112+
compatible = "qcom,nss-dp";
113+
reg = <0x0 0x3a001800 0x0 0x200>;
114+
qcom,mactype = <0>;
115+
qcom,id = <5>;
116+
117+
phy-handle = <&phy_4>;
118+
phy-mode = "sgmii";
119+
};
120+
};
121+
122+
&edma {
123+
status = "okay";
124+
};
125+
126+
&mdio {
127+
status = "okay";
128+
pinctrl-0 = <&mdio_pins>;
129+
pinctrl-names = "default";
130+
reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
131+
132+
phy_0: ethernet-phy@0 {
133+
reg = <0>;
134+
// reset-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
135+
};
136+
137+
phy_1: ethernet-phy@1 {
138+
reg = <1>;
139+
};
140+
141+
phy_2: ethernet-phy@2 {
142+
reg = <2>;
143+
};
144+
145+
phy_3: ethernet-phy@3 {
146+
reg = <3>;
147+
};
148+
149+
phy_4: ethernet-phy@4 {
150+
reg = <4>;
151+
};
152+
153+
};
154+
155+
&switch {
156+
status = "okay";
157+
158+
switch_lan_bmp = <0x1e>;
159+
switch_wan_bmp = <0x20>;
160+
switch_mac_mode = <0x00>;
161+
switch_mac_mode1 = <0xff>;
162+
switch_mac_mode2 = <0xff>;
163+
164+
qcom,port_phyinfo {
165+
port@0 {
166+
port_id = <0x01>;
167+
phy_address = <0x00>;
168+
};
169+
port@1 {
170+
port_id = <0x02>;
171+
phy_address = <0x01>;
172+
};
173+
port@2 {
174+
port_id = <0x03>;
175+
phy_address = <0x02>;
176+
};
177+
port@3 {
178+
port_id = <0x04>;
179+
phy_address = <0x03>;
180+
};
181+
port@4 {
182+
port_id = <0x05>;
183+
phy_address = <0x04>;
184+
};
185+
};
186+
};
187+
188+
&qpic_bam {
189+
status = "okay";
190+
};
191+
192+
&qpic_nand {
193+
status = "okay";
194+
195+
nand@0 {
196+
reg = <0>;
197+
198+
nand-ecc-strength = <4>;
199+
nand-ecc-step-size = <512>;
200+
nand-bus-width = <8>;
201+
};
202+
};
203+
204+
&wifi {
205+
status = "okay";
206+
};
207+
208+

‎target/linux/ipq60xx/image/generic.mk

+24-12
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,37 @@ define Device/linksys_mr7350
4747
endef
4848
TARGET_DEVICES += linksys_mr7350
4949

50-
define Device/cp01-c1
51-
$(call Device/FitImage)
52-
DEVICE_VENDOR := Qihoo
53-
DEVICE_MODEL := 360v6
54-
SOC := ipq6018
55-
endef
56-
TARGET_DEVICES += cp01-c1
50+
#define Device/cp01-c1
51+
# $(call Device/FitImage)
52+
# DEVICE_VENDOR := Qualcomm Technologies
53+
# DEVICE_MODEL := AP-CP01-C1
54+
# SOC := ipq6018
55+
#endef
56+
#TARGET_DEVICES += cp01-c1
5757

58-
define Device/eap610-outdoor
58+
#define Device/eap610-outdoor
59+
# $(call Device/FitImage)
60+
# $(call Device/UbiFit)
61+
# DEVICE_VENDOR := TP-Link
62+
# DEVICE_MODEL := EAP610-Outdoor
63+
# BLOCKSIZE := 128k
64+
# PAGESIZE := 2048
65+
# SOC := ipq6018
66+
# IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
67+
#endef
68+
#TARGET_DEVICES += eap610-outdoor
69+
70+
define Device/360_v6
5971
$(call Device/FitImage)
6072
$(call Device/UbiFit)
61-
DEVICE_VENDOR := TP-Link
62-
DEVICE_MODEL := EAP610-Outdoor
73+
DEVICE_VENDOR := Qihoo 360
74+
DEVICE_MODEL := V6
6375
BLOCKSIZE := 128k
6476
PAGESIZE := 2048
77+
DEVICE_DTS_CONFIG := config@cp03-c1
6578
SOC := ipq6018
66-
IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
6779
endef
68-
TARGET_DEVICES += eap610-outdoor
80+
TARGET_DEVICES += 360_v6
6981

7082
define Device/zn_m2
7183
$(call Device/FitImage)

‎target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ Signed-off-by: Alexandru Gagniuc <[email protected]>
1414

1515
--- a/arch/arm64/boot/dts/qcom/Makefile
1616
+++ b/arch/arm64/boot/dts/qcom/Makefile
17-
@@ -4,6 +4,10 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-
17+
@@ -4,6 +4,11 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-
1818
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
1919
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
2020
dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
2121
+dtb-$(CONFIG_ARCH_QCOM) += ipq6018-eap610-outdoor.dtb
2222
+dtb-$(CONFIG_ARCH_QCOM) += ipq6018-mr7350.dtb
2323
+dtb-$(CONFIG_ARCH_QCOM) += ipq6018-ax18.dtb
2424
+dtb-$(CONFIG_ARCH_QCOM) += ipq6018-m2.dtb
25+
+dtb-$(CONFIG_ARCH_QCOM) += ipq6018-v6.dtb
2526
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
2627
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
2728
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb

0 commit comments

Comments
 (0)