diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-14 01:00:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-14 01:00:17 -0700 |
| commit | 0e68f92f24a009e8948ccb75cf96b40509dc13a2 (patch) | |
| tree | 7c5ec79a46251d91e4e9ea95ebb571cc0536a68a /arch/arm/boot/dts | |
| parent | 8ee742488a87d4b68de69b4f59a4fb95c084dbb2 (diff) | |
| parent | 9bf4e370048d2bbae5262d0c6280e0142804a272 (diff) | |
| download | talos-obmc-linux-0e68f92f24a009e8948ccb75cf96b40509dc13a2.tar.gz talos-obmc-linux-0e68f92f24a009e8948ccb75cf96b40509dc13a2.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 0a7136462a1a..983dd5c14794 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -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"; |
