arm64: dts: ti: k3-j7200: Enable PCIe nodes at the board level
Subsystems (2)
PATCH 1/4 arm64: dts: ti: k3-j7200: Enable PCIe nodes at the board level
PCIe node defined in the top-level J7200 SoC dtsi file is incomplete and will not be functional unless it is extended with a SerDes PHY.
As the PHY and mode is only known at the board integration level, this node should only be enabled when provided with this information.
Disable the PCIe node in the dtsi files and only enable when it is actually pinned out on a given board.
--- arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 1 + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 1 + 2 files changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +1 -0
@@ -382,6 +382,7 @@ serdes0_qsgmii_link: phy@1 { }; &pcie1_rc { + status = "okay"; reset-gpios = <&exp1 2 GPIO_ACTIVE_HIGH>; phys = <&serdes0_pcie_link>; phy-names = "pcie-phy";
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +1 -0
@@ -770,6 +770,7 @@ pcie1_rc: pcie@2910000 { ranges = <0x01000000 0x0 0x18001000 0x00 0x18001000 0x0 0x0010000>, <0x02000000 0x0 0x18011000 0x00 0x18011000 0x0 0x7fef000>; dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>; + status = "disabled"; }; pcie1_ep: pcie-ep@2910000 {
Signature · 1 line
2.39.2
PATCH 2/4 arm64: dts: ti: k3-j7200: Remove PCIe endpoint node
This node is an example node for the PCIe controller in "endpoint" mode. By default the controller is in "root complex" mode and there is already a DT node for the same.
Examples should go in the bindings or other documentation.
Remove this node.
--- .../dts/ti/k3-j7200-common-proc-board.dts | 7 ------- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 20 ------------------- 2 files changed, 27 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +0 -7
@@ -388,10 +388,3 @@ &pcie1_rc { phy-names = "pcie-phy"; num-lanes = <2>; }; - -&pcie1_ep { - phys = <&serdes0_pcie_link>; - phy-names = "pcie-phy"; - num-lanes = <2>; - status = "disabled"; -};
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +0 -20
@@ -773,26 +773,6 @@ pcie1_rc: pcie@2910000 { status = "disabled"; }; - pcie1_ep: pcie-ep@2910000 { - compatible = "ti,j7200-pcie-ep", "ti,j721e-pcie-ep"; - reg = <0x00 0x02910000 0x00 0x1000>, - <0x00 0x02917000 0x00 0x400>, - <0x00 0x0d800000 0x00 0x00800000>, - <0x00 0x18000000 0x00 0x08000000>; - reg-names = "intd_cfg", "user_cfg", "reg", "mem"; - interrupt-names = "link_state"; - interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>; - ti,syscon-pcie-ctrl = <&scm_conf 0x4074>; - max-link-speed = <3>; - num-lanes = <4>; - power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>; - clocks = <&k3_clks 240 6>; - clock-names = "fck"; - max-functions = /bits/ 8 <6>; - max-virtual-functions = /bits/ 8 <4 4 4 4 0 0>; - dma-coherent; - }; - usbss0: cdns-usb@4104000 { compatible = "ti,j721e-usb"; reg = <0x00 0x4104000 0x00 0x100>;
Signature · 1 line
2.39.2
PATCH 3/4 arm64: dts: ti: k3-am65: Remove PCIe endpoint nodes
In reply to Andrew DavisThese nodes are example nodes for the PCIe controller in "endpoint" mode. By default the controller is in "root complex" mode and there is already a DT node for the same.
Examples should go in the bindings or other documentation.
Remove this node.
--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 28 ------------------------ 1 file changed, 28 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +0 -28
@@ -886,20 +886,6 @@ pcie0_rc: pcie@5500000 { status = "disabled"; }; - pcie0_ep: pcie-ep@5500000 { - compatible = "ti,am654-pcie-ep"; - reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>; - reg-names = "app", "dbics", "addr_space", "atu"; - power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>; - ti,syscon-pcie-mode = <&scm_conf 0x4060>; - num-ib-windows = <16>; - num-ob-windows = <16>; - max-link-speed = <2>; - dma-coherent; - interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>; - status = "disabled"; - }; - pcie1_rc: pcie@5600000 { compatible = "ti,am654-pcie-rc"; reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>;
@@ -921,20 +907,6 @@ pcie1_rc: pcie@5600000 { status = "disabled"; }; - pcie1_ep: pcie-ep@5600000 { - compatible = "ti,am654-pcie-ep"; - reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>; - reg-names = "app", "dbics", "addr_space", "atu"; - power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>; - ti,syscon-pcie-mode = <&scm_conf 0x4070>; - num-ib-windows = <16>; - num-ob-windows = <16>; - max-link-speed = <2>; - dma-coherent; - interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>; - status = "disabled"; - }; - mcasp0: mcasp@2b00000 { compatible = "ti,am33xx-mcasp-audio"; reg = <0x0 0x02b00000 0x0 0x2000>,
Signature · 1 line
2.39.2
PATCH 4/4 arm64: dts: ti: k3-am64: Remove PCIe endpoint node
In reply to Andrew DavisThis node is an example node for the PCIe controller in "endpoint" mode. By default the controller is in "root complex" mode and there is already a DT node for the same.
Examples should go in the bindings or other documentation.
Remove this node.
--- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 19 ------------------- arch/arm64/boot/dts/ti/k3-am642-evm.dts | 6 ------ 2 files changed, 25 deletions(-)
arch/arm64/boot/dts/ti/k3-am64-main.dtsi +0 -19
@@ -1041,25 +1041,6 @@ pcie0_rc: pcie@f102000 { status = "disabled"; }; - pcie0_ep: pcie-ep@f102000 { - compatible = "ti,am64-pcie-ep", "ti,j721e-pcie-ep"; - reg = <0x00 0x0f102000 0x00 0x1000>, - <0x00 0x0f100000 0x00 0x400>, - <0x00 0x0d000000 0x00 0x00800000>, - <0x00 0x68000000 0x00 0x08000000>; - reg-names = "intd_cfg", "user_cfg", "reg", "mem"; - interrupt-names = "link_state"; - interrupts = <GIC_SPI 203 IRQ_TYPE_EDGE_RISING>; - ti,syscon-pcie-ctrl = <&main_conf 0x4070>; - max-link-speed = <2>; - num-lanes = <1>; - power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>; - clocks = <&k3_clks 114 0>; - clock-names = "fck"; - max-functions = /bits/ 8 <1>; - status = "disabled"; - }; - epwm0: pwm@23000000 { compatible = "ti,am64-epwm", "ti,am3352-ehrpwm"; #pwm-cells = <3>;
arch/arm64/boot/dts/ti/k3-am642-evm.dts +0 -6
@@ -705,12 +705,6 @@ &pcie0_rc { num-lanes = <1>; }; -&pcie0_ep { - phys = <&serdes0_pcie_link>; - phy-names = "pcie-phy"; - num-lanes = <1>; -}; - &ecap0 { status = "okay"; /* PWM is available on Pin 1 of header J12 */
Signature · 1 line
2.39.2
Hi Andrew Davis,
Quoted 10 lines · Andrew Davis
PCIe node defined in the top-level J7200 SoC dtsi file is incomplete and will not be functional unless it is extended with a SerDes PHY.
As the PHY and mode is only known at the board integration level, this node should only be enabled when provided with this information.
Disable the PCIe node in the dtsi files and only enable when it is actually pinned out on a given board.
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/4] arm64: dts: ti: k3-j7200: Enable PCIe nodes at the board level
commit: 1b63a1b480c27764d30a0924a4982d31e15df6fd
[2/4] arm64: dts: ti: k3-j7200: Remove PCIe endpoint node
commit: 0b16abe711bd5136f2319c4f548fb20588540266
[3/4] arm64: dts: ti: k3-am65: Remove PCIe endpoint nodes
commit: e074d9d9a52eec11cd8b3f98e2576b0c762686f1
[4/4] arm64: dts: ti: k3-am64: Remove PCIe endpoint node
commit: 6cce60550763564360beadf57ecf2e4d45b585e1All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
--
Vignesh