From f71bb4f4c80a544e44e0f7d3fc8b2d313c9b1224 Mon Sep 17 00:00:00 2001
From: Tobias Poganiuch <tobias.poganiuch@seco.com>
Date: Thu, 18 Apr 2024 15:48:39 +0200
Subject: [PATCH] arm64:dts:tr8p: Merge and fix USB3 nodes and pinctrl

---
 arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi b/arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi
index db5cbaba8d4e9..6a2e7cc37d7a8 100644
--- a/arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi
+++ b/arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi
@@ -659,7 +659,6 @@ gpio_mcu: tr8mcu-gpios {
 #endif
 }; // i2c3
 
-
 &usb3_0 {
 	status = "okay";
 };
@@ -687,6 +686,8 @@ MX8MP_IOMUXC_GPIO1_IO12__USB1_PWR	0x19
 };
 
 &usb3_phy0 {
+	vbus-power-source = <&reg_usbotg_pwr>;
+	//vbus-supply = <&reg_usbotg_pwr>;
 	disable-over-current;
 	// from guf version
 	fsl,phy-tx-vref-tune = <0xe>;
@@ -716,6 +717,8 @@ MX8MP_IOMUXC_GPIO1_IO14__USB2_PWR		0x19
 };
 
 &usb3_phy1 {
+	vbus-power-source = <&reg_usbhost_pwr>;
+	//vbus-supply = <&reg_usbhost_pwr>;
 	disable-over-current;
 	// from guf version
 	fsl,phy-tx-preemp-amp-tune = <3>;
@@ -1080,18 +1083,18 @@ pinctrl_tr8mcu: tr8mcugrp {
 		fsl,pins = < MCU_INT_GPIO       PAD_GPIO >; /* MCU Interrupt */
 	};
 
-	pinctrl_usbhost_enable: usbhost-enable 	{
+	pinctrl_usbhost_enable: usbhost-enable {
 		fsl,pins = < 
 			SPIN129_GPIO		PAD_GPIO  /* USBH_PWR, USB2_PEN */
 			SPIN131_USB2_OC		PAD_GPIO  /* USBH_OC, USB2_OC */
-			>; 
+		>;
 	};
 
-	pinctrl_usbotg_enable: usbotg-enable 	{
+	pinctrl_usbotg_enable: usbotg-enable {
 		fsl,pins = < 
 			SPIN127_GPIO		PAD_GPIO  /* USBOTG_PWR, USB1_PEN */
 			SPIN133_USB1_OC		PAD_GPIO  /* USBOTG_OC, USB1_OC */
-			>;
+		>;
 	};
 
 	pinctrl_sd_vsel: sdvselgrp {
-- 
GitLab