Skip to contentSkip to conversation

Add PCIe overlay for am642-phyboard-electra

PATCH Applied Nathan Morrisson 2 participants 4 messages Jun 13, 2024 – Jun 21, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v4 cover Add PCIe overlay for am642-phyboard-electra

Remove PCIe pinmuxing from the am642-phyboard-electra device tree and provide an overlay to mux and enable PCIe.

v4:
- Add explanation for disabling usb3 to commit message

v3:
- Fix typo from .dtbs to -dtbs in Makefile for overlay testing

v2:
- Fix double space typo
- Remove redundant status = okay

Nathan Morrisson (2):
arm64: dts: ti: am642-phyboard-electra: Remove PCIe pinmuxing
arm64: dts: ti: am642-phyboard-electra: Add overlay to enable PCIe

 arch/arm64/boot/dts/ti/Makefile               |  3 +
 .../k3-am642-phyboard-electra-pcie-usb2.dtso  | 87 +++++++++++++++++++
 .../dts/ti/k3-am642-phyboard-electra-rdk.dts  | 12 ---
 3 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/2 arm64: dts: ti: am642-phyboard-electra: Remove PCIe pinmuxing

Remove pinmuxing for PCIe so that we can add it in an overlay.

---
v4: No change

v3: No change

v2: No change

 .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts    | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts +0 -12
index 6df331ccb970..30729b49dd69 100644
@@ -190,18 +190,6 @@ AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0)	/* (E19) USB0_DRVVBUS */
 		>;
 	};
 
-	pcie_usb_sel_pins_default: pcie-usb-sel-default-pins {
-		pinctrl-single,pins = <
-			AM64X_IOPAD(0x017c, PIN_OUTPUT, 7)	/* (T1) PRG0_PRU0_GPO7.GPIO1_7 */
-		>;
-	};
-
-	pcie0_pins_default: pcie0-default-pins {
-		pinctrl-single,pins = <
-			AM64X_IOPAD(0x0098, PIN_OUTPUT, 7)	/* (W19) GPMC0_WAIT0.GPIO0_37 */
-		>;
-	};
-
 	user_leds_pins_default: user-leds-default-pins {
 		pinctrl-single,pins = <
 			AM64X_IOPAD(0x003c, PIN_OUTPUT, 7)	/* (T20) GPMC0_AD0.GPIO0_15 */
Signature · 1 line
2.25.1
#2 lore raw

PATCH v4 2/2 arm64: dts: ti: am642-phyboard-electra: Add overlay to enable PCIe

In reply to Nathan Morrisson

Add an overlay to enable PCIe on the am642-phyboard-electra. The serdes is muxed from USB to PCIe, so we are restricted to USB2 while using this overlay.

---
v4:
- Add explanation for disabling usb3 to commit message

v3:
- Fix typo from .dtbs to -dtbs in Makefile for overlay testing

v2:
- Fix double space typo
- Remove redundant status = okay

 arch/arm64/boot/dts/ti/Makefile               |  3 +
 .../k3-am642-phyboard-electra-pcie-usb2.dtso  | 87 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso
arch/arm64/boot/dts/ti/Makefile +3 -0
index 2c327cc320cf..1906711b9b77 100644
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-gpio-fan.dtbo
+dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-pcie-usb2.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
@@ -134,6 +135,8 @@ k3-am642-evm-icssg1-dualemac-dtbs := \
 	k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
 k3-am642-phyboard-electra-gpio-fan-dtbs := \
 	k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-gpio-fan.dtbo
+k3-am642-phyboard-electra-pcie-usb2-dtbs := \
+	k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-pcie-usb2.dtbo
 k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
 	k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
 k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.25.1
maintainer Applied
#3 lore raw
In reply to Nathan Morrisson

Hi Nathan Morrisson,

Quoted 10 lines · Nathan Morrisson

Remove PCIe pinmuxing from the am642-phyboard-electra device tree and provide an overlay to mux and enable PCIe.

v4:
- Add explanation for disabling usb3 to commit message

v3:
- Fix typo from .dtbs to -dtbs in Makefile for overlay testing

[...]

I have applied the following to branch ti-k3-dts-next on [1]. Thank you!

[1/2] arm64: dts: ti: am642-phyboard-electra: Remove PCIe pinmuxing

      commit: 927718d246fcf14b2b642691936f2abe2e80917e
[2/2] arm64: dts: ti: am642-phyboard-electra: Add overlay to enable PCIe
      commit: e9bb631b3eb41309063fd8ad804a3935665009a4

All 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