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

Merge branch 'tegra/cleanup' into next/soc 



Dependency for tegra/soc branch.

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

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