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

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

Merge tag 'tegra-for-4.2-cleanup' of... 

Merge tag 'tegra-for-4.2-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup

Merge "ARM: tegra: Cleanup patches for v4.2-rc1" from Thierry Reding:

Just a couple of trivial cleanups such as a typofix and conversion of
hexadecimal numbers to all lower-case in DTS files for consistency.

* tag 'tegra-for-4.2-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix typo (reset -> rest) in comment
  ARM: tegra: Use lower-case hexadecimal digits
parents 16ec30ef 85aa5047

Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Example: 


	fuse@7000f800 {

		compatible = "nvidia,tegra20-efuse";

		reg = <0x7000F800 0x400>,

		reg = <0x7000f800 0x400>,

		      <0x70000000 0x400>;

		clocks = <&tegra_car TEGRA20_CLK_FUSE>;

		clock-names = "fuse";

arch/arm/boot/dts/tegra124.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ 
	apbmisc@0,70000800 {

		compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";

		reg = <0x0 0x70000800 0x0 0x64>,   /* Chip revision */

		      <0x0 0x7000E864 0x0 0x04>;   /* Strapping options */

		      <0x0 0x7000e864 0x0 0x04>;   /* Strapping options */

	};



	pinmux: pinmux@0,70000868 {

arch/arm/boot/dts/tegra20.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ 


	fuse@7000f800 {

		compatible = "nvidia,tegra20-efuse";

		reg = <0x7000F800 0x400>;

		reg = <0x7000f800 0x400>;

		clocks = <&tegra_car TEGRA20_CLK_FUSE>;

		clock-names = "fuse";

		resets = <&tegra_car 39>;

arch/arm/mach-tegra/sleep-tegra30.S

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ wfe_war: 
	b	__cpu_reset_again



	/*

	 * 38 nop's, which fills reset of wfe cache line and

	 * 38 nop's, which fills rest of wfe cache line and

	 * 4 more cachelines with nop

	 */

	.rept 38