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

Commit 8e31cbc6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

From Stephen Warren <swarren@wwwdotorg.org>:

This branch contains various minor cleanups, such as binding and .dts
renames, DT content cleanup, SDHCI support-8bit property usage cleanup, and
removal of some unnecessary sleep code.

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

:
  ARM: dt: tegra: rename board files to match SoC
  ASoC: tegra: simplify Kconfig dependencies
  ARM: dt: tegra: remove legacy support-8bit property
  mmc: tegra: use bus-width property instead of support-8bit
  ARM: tegra: Remove flow controller programming
  dt: name all Tegra binding docs consistently
  ARM: tegra20: Rename "emc" to "memory-controller"
  ARM: dt: tegra20: Rename "emc" to "memory-controller"
  ARM: tegra{20,30}: Rename "mc" to "memory-controller"
  ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
  amba: tegra-ahb: Remove empty *_remove()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0508c8e7 702b0e4f

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

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




Example:

Example:





	emc@7000f400 {

	memory-controller@7000f400 {

		#address-cells = < 1 >;

		#address-cells = < 1 >;

		#size-cells = < 0 >;

		#size-cells = < 0 >;

		compatible = "nvidia,tegra20-emc";

		compatible = "nvidia,tegra20-emc";

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

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

- interrupts : Should contain MC General interrupt.





Example:

Example:

	mc {

	memory-controller@0x7000f000 {

		compatible = "nvidia,tegra20-mc";

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;

		       0x7000f03c 0x3c4>;

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

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

- interrupts : Should contain MC General interrupt.





Example:

Example:

	mc {

	memory-controller {

		compatible = "nvidia,tegra30-mc";

		compatible = "nvidia,tegra30-mc";

		reg = <0x7000f000 0x010

		reg = <0x7000f000 0x010

		       0x7000f03c 0x1b4

		       0x7000f03c 0x1b4