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

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

Merge branch 'for-3.6/boards' of... 

Merge branch 'for-3.6/boards' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/boards

From Stephen Warren <swarren@wwwdotorg.org>
This branch contains changes to Tegra board files, and related Kconfig and
Makefile changes. Highlights include:

* Removal of Seaboard/Springbank board files; these boards can now only be
  used with device tree.

* Use of small parts of some non-DT board files from the DT board files. This
  enables all features that the non-DT board files have, when booting from DT.
  This will allow almost complete removal of all non-DT board files in v3.7.

* Other miscellaneous changes.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

* 'for-3.6/boards' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: use of_default_bus_match_table
  ARM: tegra: add device tree AUXDATA for APBDMA
  ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
  ARM: tegra: harmony: init regulators, PCIe when booting from DT
  ARM: tegra: trimslice: enable PCIe when booting from device tree
  ARM: tegra: remove Seaboard board files
  ARM: tegra: remove CONFIG_MACH_TEGRA_DT
  ARM: tegra: make .dts compilation depend on Tegra2 support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6887a413 2553dcc6

Documentation/devicetree/bindings/arm/tegra/emc.txt→Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and 


Example:



	emc@7000f400 {

	memory-controller@7000f400 {

		#address-cells = < 1 >;

		#size-cells = < 0 >;

		compatible = "nvidia,tegra20-emc";

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	mc {

	memory-controller@0x7000f000 {

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	mc {

	memory-controller {

		compatible = "nvidia,tegra30-mc";

		reg = <0x7000f000 0x010

		       0x7000f03c 0x1b4