diff options
| author | Nishanth Menon <nm@ti.com> | 2024-07-29 06:36:08 -0500 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2024-07-29 06:36:54 -0500 |
| commit | 137d9e76ae0b51d9b39c17e2675dae09de5f16e3 (patch) | |
| tree | 928d0634dd982a3a77bad834ae04051ed2f90829 /arch/arm64/boot | |
| parent | 8400291e289ee6b2bf9779ff1c83a291501f017b (diff) | |
| parent | cc5049007d722364bca4a4eeb619d5629733a004 (diff) | |
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>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts index 9338d987180d..ffa38f41679d 100644 --- a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +++ b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts @@ -1262,6 +1262,14 @@ &serdes0 { status = "okay"; + serdes0_pcie1_link: phy@0 { + reg = <0>; + cdns,num-lanes = <2>; + #phy-cells = <0>; + cdns,phy-type = <PHY_TYPE_PCIE>; + resets = <&serdes_wiz0 1>, <&serdes_wiz0 2>; + }; + serdes0_usb_link: phy@3 { reg = <3>; cdns,num-lanes = <1>; @@ -1386,23 +1394,6 @@ phys = <&transceiver3>; }; -&serdes0 { - status = "okay"; - - serdes0_pcie1_link: phy@0 { - reg = <0>; - cdns,num-lanes = <4>; - #phy-cells = <0>; - cdns,phy-type = <PHY_TYPE_PCIE>; - resets = <&serdes_wiz0 1>, <&serdes_wiz0 2>, - <&serdes_wiz0 3>, <&serdes_wiz0 4>; - }; -}; - -&serdes_wiz0 { - status = "okay"; -}; - &pcie1_rc { status = "okay"; num-lanes = <2>; |