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

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

Merge tag 'tegra-for-4.8-arm-dt' of... 

Merge tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: Device tree changes for v4.8-rc1" from Thierry Reding:

Some cleanups to existing device tree sources and add Toradex Apalis TK1
support.

* tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Initial support for Apalis TK1
  ARM: tegra: Remove commas from unit addresses on Tegra124
  ARM: tegra: Import latest Jetson TK1 spreadsheet
  ARM: tegra: Add spaces around = in properties
  ARM: tegra: Fix a couple of DTC warnings
parents 2869576d 85afd20e

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \ 
	tegra114-roth.dtb \

	tegra114-tn7.dtb

dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \

	tegra124-apalis-eval.dtb \

	tegra124-jetson-tk1.dtb \

	tegra124-nyan-big.dtb \

	tegra124-nyan-blaze.dtb \

arch/arm/boot/dts/tegra114-roth.dts

+2 −2
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock {

		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg = <0>;

			#clock-cells = <0>;

arch/arm/boot/dts/tegra114-tn7.dts

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock {

		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg = <0>;

			#clock-cells = <0>;