Skip to content

Commit 137d9e7

Browse files
committed
Merge tag 'ti-k3-dt-for-v6.11-part2' into ti-k3-dts-next
Late fixes towards v6.11-rc1 First patch fixes warning splat seen on J784S4 due to overlapping serdes0 lane. Second patch cleans up the serdes0 references for readability Signed-off-by: Nishanth Menon <nm@ti.com>
2 parents 8400291 + cc50490 commit 137d9e7

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

arch/arm64/boot/dts/ti/k3-j784s4-evm.dts

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,14 @@
12621262
&serdes0 {
12631263
status = "okay";
12641264

1265+
serdes0_pcie1_link: phy@0 {
1266+
reg = <0>;
1267+
cdns,num-lanes = <2>;
1268+
#phy-cells = <0>;
1269+
cdns,phy-type = <PHY_TYPE_PCIE>;
1270+
resets = <&serdes_wiz0 1>, <&serdes_wiz0 2>;
1271+
};
1272+
12651273
serdes0_usb_link: phy@3 {
12661274
reg = <3>;
12671275
cdns,num-lanes = <1>;
@@ -1386,23 +1394,6 @@
13861394
phys = <&transceiver3>;
13871395
};
13881396

1389-
&serdes0 {
1390-
status = "okay";
1391-
1392-
serdes0_pcie1_link: phy@0 {
1393-
reg = <0>;
1394-
cdns,num-lanes = <4>;
1395-
#phy-cells = <0>;
1396-
cdns,phy-type = <PHY_TYPE_PCIE>;
1397-
resets = <&serdes_wiz0 1>, <&serdes_wiz0 2>,
1398-
<&serdes_wiz0 3>, <&serdes_wiz0 4>;
1399-
};
1400-
};
1401-
1402-
&serdes_wiz0 {
1403-
status = "okay";
1404-
};
1405-
14061397
&pcie1_rc {
14071398
status = "okay";
14081399
num-lanes = <2>;

0 commit comments

Comments
 (0)