diff mbox

[v3,4/4] ARM: tegra: jetson-tk1: Add XUSB pad controller

Message ID 1402930623-28886-4-git-send-email-thierry.reding@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thierry Reding June 16, 2014, 2:57 p.m. UTC 
From: Thierry Reding <treding@nvidia.com>

Assign lanes to the XUSB pads as used on the Jetson TK1.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Comments

Stephen Warren June 16, 2014, 9:39 p.m. UTC | #1 
On 06/16/2014 08:57 AM, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> Assign lanes to the XUSB pads as used on the Jetson TK1.

This series looks OK to me.

Linus, are you OK with my taking it through the Tegra tree? If so, an
ack on patch 2/4 would be great. I expect there will be other series
(PCIe, SATA, XUSB drivers) that depend on this, so whichever tree it
goes through, we'll need to put it into a standalone topic branch for
various other trees to merge, or for other series to be applied on top of.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index e31fb61a81d3..38d30877057c 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1619,6 +1619,32 @@ 
 		nvidia,sys-clock-req-active-high;
 	};
 
+	padctl@0,7009f000 {
+		pinctrl-0 = <&padctl_default>;
+		pinctrl-names = "default";
+
+		padctl_default: pinmux {
+			usb3 {
+				nvidia,lanes = "pcie-0", "pcie-1";
+				nvidia,function = "usb3";
+				nvidia,iddq = <0>;
+			};
+
+			pcie {
+				nvidia,lanes = "pcie-2", "pcie-3",
+					       "pcie-4";
+				nvidia,function = "pcie";
+				nvidia,iddq = <0>;
+			};
+
+			sata {
+				nvidia,lanes = "sata-0";
+				nvidia,function = "sata";
+				nvidia,iddq = <0>;
+			};
+		};
+	};
+
 	/* SD card */
 	sdhci@0,700b0400 {
 		status = "okay";