From: Sasha Levin <sashal@kernel.org>
Date: Tue, 6 Nov 2018 06:23:39 +0000 (-0500)
Subject: Revert "ARM: tegra: Fix ULPI regression on Tegra20"
X-Git-Tag: v4.14.80~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0502f1366921284a8f418db753d9fd7af4cd5ba8;p=users%2Fjedix%2Flinux-maple.git

Revert "ARM: tegra: Fix ULPI regression on Tegra20"

This reverts commit b39ac54215190bc178ae7de799e74d327a3c1a33.

The issue was fixed by upstream commit 5d797111afe1 ("clk:
tegra: Add quirk for getting CDEV1/2 clocks on Tegra20").

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 2780e68a853b..914f59166a99 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -706,7 +706,7 @@
 		phy_type = "ulpi";
 		clocks = <&tegra_car TEGRA20_CLK_USB2>,
 			 <&tegra_car TEGRA20_CLK_PLL_U>,
-			 <&tegra_car TEGRA20_CLK_PLL_P_OUT4>;
+			 <&tegra_car TEGRA20_CLK_CDEV2>;
 		clock-names = "reg", "pll_u", "ulpi-link";
 		resets = <&tegra_car 58>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";