From 2c85e517b159051fd33c5245d406dd1dcbb97b24 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sun, 9 Jul 2017 19:36:14 +0300 Subject: [PATCH 1/5] ARM: tegra: Register host1x node with IOMMU binding on Tegra124 This registers the host1x node with the SMMU (as HC swgroup) to allow the host1x code to attach to it. It avoid failing the probe sequence, which resulted in the Tegra DRM driver not probing and thus nothing being displayed on-screen. Signed-off-by: Paul Kocialkowski Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra124.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 1b10b14a6abd..8baf00b89efb 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -87,6 +87,7 @@ clocks = <&tegra_car TEGRA124_CLK_HOST1X>; resets = <&tegra_car 28>; reset-names = "host1x"; + iommus = <&mc TEGRA_SWGROUP_HC>; #address-cells = <2>; #size-cells = <2>; From f9815688c6cfcd82b507dc7f929ec7f67fb2434f Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 16 Aug 2017 13:32:42 +0300 Subject: [PATCH 2/5] ARM: tegra: Enable UDC on Beaver Override the compatible string of the first USB controller to enable device mode. Acked-by: Stephen Warren Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra30-beaver.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 4f41b18d9547..3e104ddeb220 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -1927,6 +1927,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra30-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d004000 { status = "okay"; }; From 697af4ca666377f019a4a9f92daf995387950547 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 16 Aug 2017 13:32:43 +0300 Subject: [PATCH 3/5] ARM: tegra: Enable UDC on Dalmore Override the compatible string of the first USB controller to enable device mode. Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra114-dalmore.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 1444fbd543e7..5af4dd321952 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -1122,6 +1122,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra114-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d008000 { status = "okay"; }; From 96f1abf03e78df971b901aa8beba8c77e23a2617 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 16 Aug 2017 13:32:44 +0300 Subject: [PATCH 4/5] ARM: tegra: Enable UDC on Jetson TK1 Override the compatible string of the first USB controller to enable device mode. Tested-by: Nicolas Chauvet Acked-by: Stephen Warren Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 7bacb2954f58..61873d642a45 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1722,7 +1722,7 @@ lanes { usb2-0 { - nvidia,function = "xusb"; + nvidia,function = "snps"; status = "okay"; }; @@ -1829,6 +1829,16 @@ }; }; + usb@7d000000 { + compatible = "nvidia,tegra124-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + /* mini-PCIe USB */ usb@7d004000 { status = "okay"; From e3ff43b6c991bc8cbfa7e926ef0f655b4bae3fee Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Wed, 16 Aug 2017 13:32:45 +0300 Subject: [PATCH 5/5] ARM: tegra: Enable UDC on AC100 Override the compatible string of the first USB controller to enable device mode. Signed-off-by: Dmitry Osipenko Tested-by: Marc Dietrich Acked-by: Stephen Warren Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra20-paz00.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index b4bfa5586c23..bfa9421fcf94 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -452,7 +452,9 @@ }; usb@c5000000 { + compatible = "nvidia,tegra20-udc"; status = "okay"; + dr_mode = "peripheral"; }; usb-phy@c5000000 {