Skip to content

Commit 80bd376

Browse files
authored
Merge branch 'openwrt:main' into hasivo_s1100wp-8gt-se-openwrt
2 parents 2abf1c2 + 9d1f6ec commit 80bd376

File tree

16 files changed

+40
-190
lines changed

16 files changed

+40
-190
lines changed

.github/workflows/build-on-comment.yml

Lines changed: 0 additions & 164 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Build PR Profile
2+
3+
on:
4+
pull_request:
5+
types: [opened, edited, synchronize]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
build-pr-profile:
12+
uses: openwrt/actions-shared-workflows/.github/workflows/build-pr-profile.yml@main

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,15 @@
298298

299299
qcom,port_phyinfo {
300300
// MAC0 -> GE Phy --- MDI --- QCA8337 Switch
301-
port@0 {
301+
port@1 {
302302
port_id = <1>;
303303
mdiobus = <&mdio0>;
304304
phy_address = <7>;
305305
phy_dac = <0x10 0x10>;
306306
};
307307

308308
// MAC1 -> Uniphy --- SGMII --- QCA8081
309-
port@1 {
309+
port@2 {
310310
port_id = <2>;
311311
mdiobus = <&mdio1>;
312312
phy_address = <8>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@
8282

8383
qcom,port_phyinfo {
8484
// MAC0 -> GE Phy
85-
port@0 {
85+
port@1 {
8686
port_id = <1>;
8787
mdiobus = <&mdio0>;
8888
phy_address = <7>;
8989
};
9090

9191
// MAC1 -> Uniphy --- SGMII --- QCA8081
92-
port@1 {
92+
port@2 {
9393
port_id = <2>;
9494
mdiobus = <&mdio1>;
9595
phy_address = <28>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax850.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@
8181

8282
qcom,port_phyinfo {
8383
// MAC0 -> GE Phy
84-
port@0 {
84+
port@1 {
8585
port_id = <1>;
8686
mdiobus = <&mdio0>;
8787
phy_address = <7>;
8888
};
8989

9090
// MAC1 -> Uniphy --- SGMII --- QCA8081
91-
port@1 {
91+
port@2 {
9292
port_id = <2>;
9393
mdiobus = <&mdio1>;
9494
phy_address = <28>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@
6464

6565
qcom,port_phyinfo {
6666
// MAC0 -> GE Phy -> QCA8337 Phy2
67-
port@0 {
67+
port@1 {
6868
port_id = <1>;
6969
mdiobus = <&mdio0>;
7070
phy_address = <7>;
7171
};
7272

7373
// MAC1 ---SGMII---> QCA8337 SerDes
74-
port@1 {
74+
port@2 {
7575
port_id = <2>;
7676
forced-speed = <1000>;
7777
forced-duplex = <1>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555

5656
qcom,port_phyinfo {
5757
// MAC0 -> GE Phy
58-
port@0 {
58+
port@1 {
5959
port_id = <1>;
6060
mdiobus = <&mdio0>;
6161
phy_address = <7>;
6262
};
6363

6464
// MAC1 ---SGMII---> QCA8337 SerDes
65-
port@1 {
65+
port@2 {
6666
port_id = <2>;
6767
forced-speed = <1000>;
6868
forced-duplex = <1>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
qcom,port_phyinfo {
3838
// MAC0 -> GE Phy -> QCA8337 Phy4
39-
port@0 {
39+
port@1 {
4040
port_id = <1>;
4141
mdiobus = <&mdio0>;
4242
phy_address = <7>;
4343
};
4444

4545
// MAC1 ---SGMII---> QCA8337 SerDes
46-
port@1 {
46+
port@2 {
4747
port_id = <2>;
4848
forced-speed = <1000>;
4949
forced-duplex = <1>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535

3636
qcom,port_phyinfo {
3737
// MAC0 -> GE Phy -> QCA8337 Phy4
38-
port@0 {
38+
port@1 {
3939
port_id = <1>;
4040
mdiobus = <&mdio0>;
4141
phy_address = <7>;
4242
};
4343

4444
// MAC1 ---SGMII---> QCA8337 SerDes
45-
port@1 {
45+
port@2 {
4646
port_id = <2>;
4747
forced-speed = <1000>;
4848
forced-duplex = <1>;

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx6200.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939

4040
qcom,port_phyinfo {
4141
// MAC0 -> GE Phy -> MDI --> RJ45
42-
port@0 {
42+
port@1 {
4343
port_id = <1>;
4444
mdiobus = <&mdio0>;
4545
phy_address = <7>;
4646
};
4747

4848
// MAC1 ---SGMII---> MaxLinear PHY -> RJ45
49-
port@1 {
49+
port@2 {
5050
port_id = <2>;
5151
mdiobus = <&mdio1>;
5252
phy_address = <15>;

0 commit comments

Comments
 (0)