[PATCH v2 2/2] ARM: dts: am33xx: Move wkup_m3 node to soc node and add ranges

Dave Gerlach d-gerlach at ti.com
Wed Mar 4 20:12:22 PST 2015


Signed-off-by: Suman Anna <s-anna at ti.com>
Signed-off-by: Dave Gerlach <d-gerlach at ti.com>
---
 arch/arm/boot/dts/am33xx.dtsi | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index acd3705..086415c 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -77,10 +77,23 @@
 	 */
 	soc {
 		compatible = "ti,omap-infra";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0     0x44d00000 0x4000>,
+			 <0x80000 0x44d80000 0x2000>;
+
 		mpu {
 			compatible = "ti,omap3-mpu";
 			ti,hwmods = "mpu";
 		};
+
+		wkup_m3: wkup_m3 at 44d00000 {
+			compatible = "ti,am3353-wkup-m3";
+			reg = <0x0     0x4000>,	/* M3 UMEM */
+			      <0x80000 0x2000>;	/* M3 DMEM */
+			ti,hwmods = "wkup_m3";
+			ti,pm-firmware = "am335x-pm-firmware.elf";
+		};
 	};
 
 	am33xx_control_module: control_module at 4a002000 {
@@ -755,14 +768,6 @@
 			reg = <0x40300000 0x10000>; /* 64k */
 		};
 
-		wkup_m3: wkup_m3 at 44d00000 {
-			compatible = "ti,am3353-wkup-m3";
-			reg = <0x44d00000 0x4000	/* M3 UMEM */
-			       0x44d80000 0x2000>;	/* M3 DMEM */
-			ti,hwmods = "wkup_m3";
-			ti,no-reset-on-init;
-		};
-
 		elm: elm at 48080000 {
 			compatible = "ti,am3352-elm";
 			reg = <0x48080000 0x2000>;
-- 
2.3.0




More information about the linux-arm-kernel mailing list