aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gerlach <d-gerlach@ti.com>2015-05-06 13:25:33 -0400
committerTony Lindgren <tony@atomide.com>2015-07-06 08:11:13 -0400
commitfff75ee150104fdc29d86a75a5511482a981c27b (patch)
tree780c894bd1af3d755d00425bd48d07fb2d0cc4f1
parent5c250adb51ca318b67ac3a230a565dbe2ea9f0ef (diff)
ARM: dts: am4372: Add emif node
Add node for TI AM4372 EMIF. Without this we get a warning with the recent commit fabbe6df (ARM: OMAP: AM43xx hwmod: Add data for am43xx emif hwmod). Signed-off-by: Dave Gerlach <d-gerlach@ti.com> Tested-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--Documentation/devicetree/bindings/memory-controllers/ti/emif.txt1
-rw-r--r--arch/arm/boot/dts/am4372.dtsi6
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
index 938f8e1ba205..0db60470ebb6 100644
--- a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it.
8Required properties: 8Required properties:
9- compatible : Should be of the form "ti,emif-<ip-rev>" where <ip-rev> 9- compatible : Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
10 is the IP revision of the specific EMIF instance. 10 is the IP revision of the specific EMIF instance.
11 For am437x should be ti,emif-am4372.
11 12
12- phy-type : <u32> indicating the DDR phy type. Following are the 13- phy-type : <u32> indicating the DDR phy type. Following are the
13 allowed values 14 allowed values
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index c80a3e233792..9521a3827021 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -132,6 +132,12 @@
132 }; 132 };
133 }; 133 };
134 134
135 emif: emif@4c000000 {
136 compatible = "ti,emif-am4372";
137 reg = <0x4c000000 0x1000000>;
138 ti,hwmods = "emif";
139 };
140
135 edma: edma@49000000 { 141 edma: edma@49000000 {
136 compatible = "ti,edma3"; 142 compatible = "ti,edma3";
137 ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; 143 ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";