Commit 137d9e76 authored by Nishanth Menon's avatar Nishanth Menon

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: default avatarNishanth Menon <nm@ti.com>
parents 8400291e cc504900
...@@ -1262,6 +1262,14 @@ &dss { ...@@ -1262,6 +1262,14 @@ &dss {
&serdes0 { &serdes0 {
status = "okay"; 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 { serdes0_usb_link: phy@3 {
reg = <3>; reg = <3>;
cdns,num-lanes = <1>; cdns,num-lanes = <1>;
...@@ -1386,23 +1394,6 @@ &main_mcan4 { ...@@ -1386,23 +1394,6 @@ &main_mcan4 {
phys = <&transceiver3>; 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 { &pcie1_rc {
status = "okay"; status = "okay";
num-lanes = <2>; num-lanes = <2>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment