Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15517127 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.1-fixes-for-rc3' of... 

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

Merge "ARM: tegra: Device tree fixes for v4.1-rc3" from Thierry Reding:

This contains a fix for a bug that was introduced a couple of months ago
by a patch that git misapplied because of a lack of context.

* tag 'tegra-for-4.1-fixes-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct which USB controller has the UTMI pad registers
parents 030bbdbf a4b6916c

arch/arm/boot/dts/tegra124.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 59>, <&tegra_car 22>;

		resets = <&tegra_car 22>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;
@@ -838,6 +838,7 @@ 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		status = "disabled";

	};
@@ -862,7 +863,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 22>, <&tegra_car 22>;

		resets = <&tegra_car 58>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;
@@ -874,7 +875,6 @@ 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		status = "disabled";

	};
@@ -899,7 +899,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 58>, <&tegra_car 22>;

		resets = <&tegra_car 59>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;