From 8820f2ec488e21762f3c83898c5aa31f3b4d7313 Mon Sep 17 00:00:00 2001 From: BH Hsieh Date: Mon, 18 Sep 2017 16:01:37 +0800 Subject: [PATCH] r28.2: DNI: dts: tegra210: jetson: enable usb on E3325 As USB3.0 port and PCIe x1 socket on E3325 are sharing the same uphy lane 0 from M.2, either USB3.0 or PCIe x1 could be enabled on E3325. Currently PCIe x1 is enabled on E3325 by default per POR. This change enables USB3.0 port on E3325, which means PCIe x1 is disabled on E3325 with this change. bug 200295515 Change-Id: I07e32fceeaaf3c053ce23a5367db68646d3972a3 Signed-off-by: BH Hsieh --- .../jetson-platforms/tegra210-comms-p2530-0930.dtsi | 9 ++++++++- .../tegra210-jetson-cv-base-p2597-2180-a00.dts | 21 +++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/kernel-dts/jetson-platforms/tegra210-comms-p2530-0930.dtsi b/kernel-dts/jetson-platforms/tegra210-comms-p2530-0930.dtsi index c3801e2..d81e4f3 100644 --- a/kernel-dts/jetson-platforms/tegra210-comms-p2530-0930.dtsi +++ b/kernel-dts/jetson-platforms/tegra210-comms-p2530-0930.dtsi @@ -20,11 +20,18 @@ gpios = < TEGRA_GPIO(H, 0) 0 TEGRA_GPIO(I, 0) 0 - TEGRA_GPIO(I, 2) 0 >; label = "wlan-default-output-high-h0", "wlan-default-output-high-i0"; }; + + wlan-default-output-low { + gpio-hog; + output-low; + gpios = < + TEGRA_GPIO(I, 2) 0 + >; + }; }; bluedroid_pm { /* BT BCM43340 in P2530 Compute Module */ diff --git a/kernel-dts/tegra210-jetson-cv-base-p2597-2180-a00.dts b/kernel-dts/tegra210-jetson-cv-base-p2597-2180-a00.dts index f22add1..37137fe 100644 --- a/kernel-dts/tegra210-jetson-cv-base-p2597-2180-a00.dts +++ b/kernel-dts/tegra210-jetson-cv-base-p2597-2180-a00.dts @@ -597,11 +597,26 @@ nvidia,pcie-controller = <1>; nvidia,pcie-lane-select = ; + status = "disabled"; }; sata { nvidia,lanes = "uphy-lane-7"; nvidia,function = "sata"; }; + e3325-usb2-std-A { + nvidia,lanes = "otg-3"; + nvidia,function = "xusb"; + nvidia,port-cap = + ; + }; + e3325-usb3-std-A { + nvidia,lanes = "uphy-lane-0"; + nvidia,function = "usb3"; + nvidia,usb3-port = <2>; + nvidia,usb2-map = <3>; + nvidia,port-cap = + ; + }; }; }; @@ -614,8 +629,10 @@ <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_USB3_P(1)>, <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_UTMI_P(1)>, <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_USB3_P(0)>, - <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_UTMI_P(0)>; - phy-names = "utmi-2", "usb3-1", "utmi-1", "usb3-0", "utmi-0"; + <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_UTMI_P(0)>, + <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_UTMI_P(3)>, + <&tegra_padctl_uphy TEGRA_PADCTL_UPHY_USB3_P(2)>; + phy-names = "utmi-2", "usb3-1", "utmi-1", "usb3-0", "utmi-0", "utmi-3", "usb3-2"; nvidia,pmc-wakeup = <&tegra_pmc PMC_WAKE_TYPE_EVENT 39 PMC_TRIGGER_TYPE_HIGH>, -- 2.1.4