aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-08-30 11:19:52 -0400
committerTony Lindgren <tony@atomide.com>2017-09-19 13:30:46 -0400
commitcd57dc5a2099a43c99fb39cb7c953246149db816 (patch)
tree68b5115cb448fa6ba4eb93995d0add5cc1e0b7e0
parentef90bfb8be2b0f7f1d9308ff3defa1b441c661f9 (diff)
ARM: dts: Add missing hwmod related nodes for am33xx
On am33xx we're missing the pmu and emif nodes with their related "ti,hwmods" properties that the SoC interconnect code needs. Note that this will only show up as a bug with "doesn't have mpu register target base" boot errors when the legacy platform data is removed. Let's also update the related binding documentation while at it. Cc: Mark Rutland <mark.rutland@arm.com> Acked-by: Rob Herring <robh+dt@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--Documentation/devicetree/bindings/memory-controllers/ti/emif.txt6
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi10
2 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
index 0db60470ebb6..fd823d6091b2 100644
--- a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
@@ -7,8 +7,10 @@ of the EMIF IP and memory parts attached to it.
7 7
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. For newer controllers,
11 For am437x should be ti,emif-am4372. 11 compatible should be one of the following:
12 "ti,emif-am3352"
13 "ti,emif-am4372"
12 14
13- phy-type : <u32> indicating the DDR phy type. Following are the 15- phy-type : <u32> indicating the DDR phy type. Following are the
14 allowed values 16 allowed values
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 7d7ca054c557..08653552db71 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -128,9 +128,11 @@
128 }; 128 };
129 }; 129 };
130 130
131 pmu { 131 pmu@4b000000 {
132 compatible = "arm,cortex-a8-pmu"; 132 compatible = "arm,cortex-a8-pmu";
133 interrupts = <3>; 133 interrupts = <3>;
134 reg = <0x4b000000 0x1000000>;
135 ti,hwmods = "debugss";
134 }; 136 };
135 137
136 /* 138 /*
@@ -927,6 +929,12 @@
927 }; 929 };
928 }; 930 };
929 931
932 emif: emif@4c000000 {
933 compatible = "ti,emif-am3352";
934 reg = <0x4c000000 0x1000000>;
935 ti,hwmods = "emif";
936 };
937
930 gpmc: gpmc@50000000 { 938 gpmc: gpmc@50000000 {
931 compatible = "ti,am3352-gpmc"; 939 compatible = "ti,am3352-gpmc";
932 ti,hwmods = "gpmc"; 940 ti,hwmods = "gpmc";