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

Commit 5088774b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ARM: tegra: Device tree changes for v4.13-rc1

This removes support for the Whistler board, which only a handful of
people ever had access to and which doesn't provide any features over
other Tegra20 devices that we support.

Also this cleans up some PCI related device tree content in preparation
for a future DTC release that has additional checks for the PCI bus.

* tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: dts: tegra: fix PCI bus dtc warnings
  ARM: tegra: remove Whistler support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0d817768 508d690e

Documentation/devicetree/bindings/arm/tegra.txt

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ board-specific compatible values: 
  nvidia,harmony

  nvidia,seaboard

  nvidia,ventana

  nvidia,whistler

  toradex,apalis_t30

  toradex,apalis_t30-eval

  toradex,apalis-tk1

arch/arm/boot/dts/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -928,8 +928,7 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ 
	tegra20-seaboard.dtb \

	tegra20-tec.dtb \

	tegra20-trimslice.dtb \

	tegra20-ventana.dtb \

	tegra20-whistler.dtb

	tegra20-ventana.dtb

dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \

	tegra30-apalis-eval.dtb \

	tegra30-beaver.dtb \

arch/arm/boot/dts/tegra124-apalis-eval.dts

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	pcie-controller@01003000 {

	pcie@1003000 {

		pci@1,0 {

			status = "okay";

		};

arch/arm/boot/dts/tegra124-apalis.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		reg = <0x0 0x80000000 0x0 0x80000000>;

	};



	pcie-controller@01003000 {

	pcie@1003000 {

		status = "okay";



		avddio-pex-supply = <&vdd_1v05>;

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
		reg = <0x0 0x80000000 0x0 0x80000000>;

	};



	pcie-controller@01003000 {

	pcie@1003000 {

		status = "okay";



		avddio-pex-supply = <&vdd_1v05_run>;