Commit 0e68f92f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-4.17-fixes' of...

Merge tag 'tegra-for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into fixes

ARM: tegra: Device tree fixes for v4.17

This contains a single revert for a patch that was merged in v4.17-rc1
and that turns out to cause a regression on some boards. Further, the
original issue that the patch was supposed to fix seems to have
disappeared.

* tag 'tegra-for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: dts: tegra20: Revert "Fix ULPI regression on Tegra20"

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8ee74248 9bf4e370
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,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";