All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20180925000545.22931-3-tony@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index bd495e4..0fd4ec0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,14 +37,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
  		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
  			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  
--		l4_wkup: l4_wkup@44c00000 {
+-		l4_wkup: l4_wkup at 44c00000 {
 -			compatible = "ti,am4-l4-wkup", "simple-bus";
 -			#address-cells = <1>;
 -			#size-cells = <1>;
 -			ranges = <0 0x44c00000 0x287000>;
 -
-+		l4_wkup: interconnect@44c00000 {
- 			wkup_m3: wkup_m3@100000 {
++		l4_wkup: interconnect at 44c00000 {
+ 			wkup_m3: wkup_m3 at 100000 {
  				compatible = "ti,am4372-wkup-m3";
  				reg = <0x100000 0x4000>,
 @@ -173,75 +169,10 @@
@@ -52,7 +52,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
  				ti,pm-firmware = "am335x-pm-firmware.elf";
  			};
 -
--			prcm: prcm@1f0000 {
+-			prcm: prcm at 1f0000 {
 -				compatible = "ti,am4-prcm", "simple-bus";
 -				reg = <0x1f0000 0x11000>;
 -				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
@@ -69,14 +69,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				};
 -			};
 -
--			scm: scm@210000 {
+-			scm: scm at 210000 {
 -				compatible = "ti,am4-scm", "simple-bus";
 -				reg = <0x210000 0x4000>;
 -				#address-cells = <1>;
 -				#size-cells = <1>;
 -				ranges = <0 0x210000 0x4000>;
 -
--				am43xx_pinmux: pinmux@800 {
+-				am43xx_pinmux: pinmux at 800 {
 -					compatible = "ti,am437-padconf",
 -						     "pinctrl-single";
 -					reg = <0x800 0x31c>;
@@ -89,7 +89,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -					pinctrl-single,function-mask = <0xffffffff>;
 -				};
 -
--				scm_conf: scm_conf@0 {
+-				scm_conf: scm_conf at 0 {
 -					compatible = "syscon";
 -					reg = <0x0 0x800>;
 -					#address-cells = <1>;
@@ -101,7 +101,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -					};
 -				};
 -
--				wkup_m3_ipc: wkup_m3_ipc@1324 {
+-				wkup_m3_ipc: wkup_m3_ipc at 1324 {
 -					compatible = "ti,am4372-wkup-m3-ipc";
 -					reg = <0x1324 0x44>;
 -					interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
@@ -109,7 +109,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -					mboxes = <&mailbox &mbox_wkupm3>;
 -				};
 -
--				edma_xbar: dma-router@f90 {
+-				edma_xbar: dma-router at f90 {
 -					compatible = "ti,am335x-edma-crossbar";
 -					reg = <0xf90 0x40>;
 -					#dma-cells = <3>;
@@ -121,24 +121,24 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				};
 -			};
 +		};
-+		l4_per: interconnect@48000000 {
++		l4_per: interconnect at 48000000 {
 +		};
-+		l4_fast: interconnect@4a000000 {
++		l4_fast: interconnect at 4a000000 {
  		};
  
- 		emif: emif@4c000000 {
+ 		emif: emif at 4c000000 {
 @@ -297,333 +228,6 @@
  			interrupt-names = "edma3_tcerrint";
  		};
  
--		uart0: serial@44e09000 {
+-		uart0: serial at 44e09000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x44e09000 0x2000>;
 -			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 -			ti,hwmods = "uart1";
 -		};
 -
--		uart1: serial@48022000 {
+-		uart1: serial at 48022000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x48022000 0x2000>;
 -			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@@ -146,7 +146,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		uart2: serial@48024000 {
+-		uart2: serial at 48024000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x48024000 0x2000>;
 -			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
@@ -154,7 +154,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		uart3: serial@481a6000 {
+-		uart3: serial at 481a6000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x481a6000 0x2000>;
 -			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
@@ -162,7 +162,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		uart4: serial@481a8000 {
+-		uart4: serial at 481a8000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x481a8000 0x2000>;
 -			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -170,7 +170,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		uart5: serial@481aa000 {
+-		uart5: serial at 481aa000 {
 -			compatible = "ti,am4372-uart","ti,omap2-uart";
 -			reg = <0x481aa000 0x2000>;
 -			interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -178,7 +178,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		mailbox: mailbox@480c8000 {
+-		mailbox: mailbox at 480c8000 {
 -			compatible = "ti,omap4-mailbox";
 -			reg = <0x480C8000 0x200>;
 -			interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -193,7 +193,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		timer1: timer@44e31000 {
+-		timer1: timer at 44e31000 {
 -			compatible = "ti,am4372-timer-1ms","ti,am335x-timer-1ms";
 -			reg = <0x44e31000 0x400>;
 -			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
@@ -203,7 +203,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			clock-names = "fck";
 -		};
 -
--		timer2: timer@48040000  {
+-		timer2: timer at 48040000  {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48040000  0x400>;
 -			interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
@@ -212,7 +212,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			clock-names = "fck";
 -		};
 -
--		timer3: timer@48042000 {
+-		timer3: timer at 48042000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48042000 0x400>;
 -			interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@@ -220,7 +220,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer4: timer@48044000 {
+-		timer4: timer at 48044000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48044000 0x400>;
 -			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -229,7 +229,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer5: timer@48046000 {
+-		timer5: timer at 48046000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48046000 0x400>;
 -			interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -238,7 +238,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer6: timer@48048000 {
+-		timer6: timer at 48048000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48048000 0x400>;
 -			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -247,7 +247,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer7: timer@4804a000 {
+-		timer7: timer at 4804a000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x4804a000 0x400>;
 -			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
@@ -256,7 +256,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer8: timer@481c1000 {
+-		timer8: timer at 481c1000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x481c1000 0x400>;
 -			interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -264,7 +264,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer9: timer@4833d000 {
+-		timer9: timer at 4833d000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x4833d000 0x400>;
 -			interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
@@ -272,7 +272,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer10: timer@4833f000 {
+-		timer10: timer at 4833f000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x4833f000 0x400>;
 -			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
@@ -280,7 +280,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		timer11: timer@48341000 {
+-		timer11: timer at 48341000 {
 -			compatible = "ti,am4372-timer","ti,am335x-timer";
 -			reg = <0x48341000 0x400>;
 -			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
@@ -288,13 +288,13 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		counter32k: counter@44e86000 {
+-		counter32k: counter at 44e86000 {
 -			compatible = "ti,am4372-counter32k","ti,omap-counter32k";
 -			reg = <0x44e86000 0x40>;
 -			ti,hwmods = "counter_32k";
 -		};
 -
--		rtc: rtc@44e3e000 {
+-		rtc: rtc at 44e3e000 {
 -			compatible = "ti,am4372-rtc", "ti,am3352-rtc",
 -				     "ti,da830-rtc";
 -			reg = <0x44e3e000 0x1000>;
@@ -307,14 +307,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		wdt: wdt@44e35000 {
+-		wdt: wdt at 44e35000 {
 -			compatible = "ti,am4372-wdt","ti,omap3-wdt";
 -			reg = <0x44e35000 0x1000>;
 -			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
 -			ti,hwmods = "wd_timer2";
 -		};
 -
--		gpio0: gpio@44e07000 {
+-		gpio0: gpio at 44e07000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x44e07000 0x1000>;
 -			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -326,7 +326,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		gpio1: gpio@4804c000 {
+-		gpio1: gpio at 4804c000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x4804c000 0x1000>;
 -			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -338,7 +338,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		gpio2: gpio@481ac000 {
+-		gpio2: gpio at 481ac000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x481ac000 0x1000>;
 -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
@@ -350,7 +350,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		gpio3: gpio@481ae000 {
+-		gpio3: gpio at 481ae000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x481ae000 0x1000>;
 -			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -362,7 +362,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		gpio4: gpio@48320000 {
+-		gpio4: gpio at 48320000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x48320000 0x1000>;
 -			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
@@ -374,7 +374,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		gpio5: gpio@48322000 {
+-		gpio5: gpio at 48322000 {
 -			compatible = "ti,am4372-gpio","ti,omap4-gpio";
 -			reg = <0x48322000 0x1000>;
 -			interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
@@ -386,14 +386,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		hwspinlock: spinlock@480ca000 {
+-		hwspinlock: spinlock at 480ca000 {
 -			compatible = "ti,omap4-hwspinlock";
 -			reg = <0x480ca000 0x1000>;
 -			ti,hwmods = "spinlock";
 -			#hwlock-cells = <1>;
 -		};
 -
--		i2c0: i2c@44e0b000 {
+-		i2c0: i2c at 44e0b000 {
 -			compatible = "ti,am4372-i2c","ti,omap4-i2c";
 -			reg = <0x44e0b000 0x1000>;
 -			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@@ -403,7 +403,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		i2c1: i2c@4802a000 {
+-		i2c1: i2c at 4802a000 {
 -			compatible = "ti,am4372-i2c","ti,omap4-i2c";
 -			reg = <0x4802a000 0x1000>;
 -			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
@@ -413,7 +413,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		i2c2: i2c@4819c000 {
+-		i2c2: i2c at 4819c000 {
 -			compatible = "ti,am4372-i2c","ti,omap4-i2c";
 -			reg = <0x4819c000 0x1000>;
 -			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
@@ -423,7 +423,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		spi0: spi@48030000 {
+-		spi0: spi at 48030000 {
 -			compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 -			reg = <0x48030000 0x400>;
 -			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
@@ -433,7 +433,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		mmc1: mmc@48060000 {
+-		mmc1: mmc at 48060000 {
 -			compatible = "ti,omap4-hsmmc";
 -			reg = <0x48060000 0x1000>;
 -			ti,hwmods = "mmc1";
@@ -446,7 +446,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		mmc2: mmc@481d8000 {
+-		mmc2: mmc at 481d8000 {
 -			compatible = "ti,omap4-hsmmc";
 -			reg = <0x481d8000 0x1000>;
 -			ti,hwmods = "mmc2";
@@ -458,14 +458,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
- 		mmc3: mmc@47810000 {
+ 		mmc3: mmc at 47810000 {
  			compatible = "ti,omap4-hsmmc";
  			reg = <0x47810000 0x1000>;
 @@ -633,282 +237,6 @@
  			status = "disabled";
  		};
  
--		spi1: spi@481a0000 {
+-		spi1: spi at 481a0000 {
 -			compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 -			reg = <0x481a0000 0x400>;
 -			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
@@ -475,7 +475,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		spi2: spi@481a2000 {
+-		spi2: spi at 481a2000 {
 -			compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 -			reg = <0x481a2000 0x400>;
 -			interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
@@ -485,7 +485,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		spi3: spi@481a4000 {
+-		spi3: spi at 481a4000 {
 -			compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 -			reg = <0x481a4000 0x400>;
 -			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
@@ -495,7 +495,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		spi4: spi@48345000 {
+-		spi4: spi at 48345000 {
 -			compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 -			reg = <0x48345000 0x400>;
 -			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
@@ -505,7 +505,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		mac: ethernet@4a100000 {
+-		mac: ethernet at 4a100000 {
 -			compatible = "ti,am4372-cpsw","ti,cpsw";
 -			reg = <0x4a100000 0x800
 -			       0x4a101200 0x100>;
@@ -533,7 +533,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ranges;
 -			syscon = <&scm_conf>;
 -
--			davinci_mdio: mdio@4a101000 {
+-			davinci_mdio: mdio at 4a101000 {
 -				compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
 -				reg = <0x4a101000 0x100>;
 -				#address-cells = <1>;
@@ -543,24 +543,24 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				status = "disabled";
 -			};
 -
--			cpsw_emac0: slave@4a100200 {
+-			cpsw_emac0: slave at 4a100200 {
 -				/* Filled in by U-Boot */
 -				mac-address = [ 00 00 00 00 00 00 ];
 -			};
 -
--			cpsw_emac1: slave@4a100300 {
+-			cpsw_emac1: slave at 4a100300 {
 -				/* Filled in by U-Boot */
 -				mac-address = [ 00 00 00 00 00 00 ];
 -			};
 -
--			phy_sel: cpsw-phy-sel@44e10650 {
+-			phy_sel: cpsw-phy-sel at 44e10650 {
 -				compatible = "ti,am43xx-cpsw-phy-sel";
 -				reg= <0x44e10650 0x4>;
 -				reg-names = "gmii-sel";
 -			};
 -		};
 -
--		epwmss0: epwmss@48300000 {
+-		epwmss0: epwmss at 48300000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x48300000 0x10>;
 -			#address-cells = <1>;
@@ -569,7 +569,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss0";
 -			status = "disabled";
 -
--			ecap0: ecap@48300100 {
+-			ecap0: ecap at 48300100 {
 -				compatible = "ti,am4372-ecap",
 -					     "ti,am3352-ecap",
 -					     "ti,am33xx-ecap";
@@ -580,7 +580,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				status = "disabled";
 -			};
 -
--			ehrpwm0: pwm@48300200 {
+-			ehrpwm0: pwm at 48300200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -592,7 +592,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		epwmss1: epwmss@48302000 {
+-		epwmss1: epwmss at 48302000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x48302000 0x10>;
 -			#address-cells = <1>;
@@ -601,7 +601,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss1";
 -			status = "disabled";
 -
--			ecap1: ecap@48302100 {
+-			ecap1: ecap at 48302100 {
 -				compatible = "ti,am4372-ecap",
 -					     "ti,am3352-ecap",
 -					     "ti,am33xx-ecap";
@@ -612,7 +612,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				status = "disabled";
 -			};
 -
--			ehrpwm1: pwm@48302200 {
+-			ehrpwm1: pwm at 48302200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -624,7 +624,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		epwmss2: epwmss@48304000 {
+-		epwmss2: epwmss at 48304000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x48304000 0x10>;
 -			#address-cells = <1>;
@@ -633,7 +633,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss2";
 -			status = "disabled";
 -
--			ecap2: ecap@48304100 {
+-			ecap2: ecap at 48304100 {
 -				compatible = "ti,am4372-ecap",
 -					     "ti,am3352-ecap",
 -					     "ti,am33xx-ecap";
@@ -644,7 +644,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -				status = "disabled";
 -			};
 -
--			ehrpwm2: pwm@48304200 {
+-			ehrpwm2: pwm at 48304200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -656,7 +656,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		epwmss3: epwmss@48306000 {
+-		epwmss3: epwmss at 48306000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x48306000 0x10>;
 -			#address-cells = <1>;
@@ -665,7 +665,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss3";
 -			status = "disabled";
 -
--			ehrpwm3: pwm@48306200 {
+-			ehrpwm3: pwm at 48306200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -677,7 +677,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		epwmss4: epwmss@48308000 {
+-		epwmss4: epwmss at 48308000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x48308000 0x10>;
 -			#address-cells = <1>;
@@ -686,7 +686,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss4";
 -			status = "disabled";
 -
--			ehrpwm4: pwm@48308200 {
+-			ehrpwm4: pwm at 48308200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -698,7 +698,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		epwmss5: epwmss@4830a000 {
+-		epwmss5: epwmss at 4830a000 {
 -			compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 -			reg = <0x4830a000 0x10>;
 -			#address-cells = <1>;
@@ -707,7 +707,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			ti,hwmods = "epwmss5";
 -			status = "disabled";
 -
--			ehrpwm5: pwm@4830a200 {
+-			ehrpwm5: pwm at 4830a200 {
 -				compatible = "ti,am4372-ehrpwm",
 -					     "ti,am3352-ehrpwm",
 -					     "ti,am33xx-ehrpwm";
@@ -719,7 +719,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		tscadc: tscadc@44e0d000 {
+-		tscadc: tscadc at 44e0d000 {
 -			compatible = "ti,am3359-tscadc";
 -			reg = <0x44e0d000 0x1000>;
 -			ti,hwmods = "adc_tsc";
@@ -741,21 +741,21 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -
 -		};
 -
- 		sham: sham@53100000 {
+ 		sham: sham at 53100000 {
  			compatible = "ti,omap5-sham";
  			ti,hwmods = "sham";
 @@ -938,53 +266,6 @@
  			dma-names = "tx", "rx";
  		};
  
--		rng: rng@48310000 {
+-		rng: rng at 48310000 {
 -			compatible = "ti,omap4-rng";
 -			ti,hwmods = "rng";
 -			reg = <0x48310000 0x2000>;
 -			interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
 -		};
 -
--		mcasp0: mcasp@48038000 {
+-		mcasp0: mcasp at 48038000 {
 -			compatible = "ti,am33xx-mcasp-audio";
 -			ti,hwmods = "mcasp0";
 -			reg = <0x48038000 0x2000>,
@@ -770,7 +770,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			dma-names = "tx", "rx";
 -		};
 -
--		mcasp1: mcasp@4803c000 {
+-		mcasp1: mcasp at 4803c000 {
 -			compatible = "ti,am33xx-mcasp-audio";
 -			ti,hwmods = "mcasp1";
 -			reg = <0x4803C000 0x2000>,
@@ -785,7 +785,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			dma-names = "tx", "rx";
 -		};
 -
--		elm: elm@48080000 {
+-		elm: elm at 48080000 {
 -			compatible = "ti,am3352-elm";
 -			reg = <0x48080000 0x2000>;
 -			interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
@@ -795,21 +795,21 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
- 		gpmc: gpmc@50000000 {
+ 		gpmc: gpmc at 50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";
 @@ -1005,102 +286,6 @@
  			status = "disabled";
  		};
  
--		ocp2scp0: ocp2scp@483a8000 {
+-		ocp2scp0: ocp2scp at 483a8000 {
 -			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
 -			#address-cells = <1>;
 -			#size-cells = <1>;
 -			ranges;
 -			ti,hwmods = "ocp2scp0";
 -
--			usb2_phy1: phy@483a8000 {
+-			usb2_phy1: phy at 483a8000 {
 -				compatible = "ti,am437x-usb2";
 -				reg = <0x483a8000 0x8000>;
 -				syscon-phy-power = <&scm_conf 0x620>;
@@ -821,14 +821,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		ocp2scp1: ocp2scp@483e8000 {
+-		ocp2scp1: ocp2scp at 483e8000 {
 -			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
 -			#address-cells = <1>;
 -			#size-cells = <1>;
 -			ranges;
 -			ti,hwmods = "ocp2scp1";
 -
--			usb2_phy2: phy@483e8000 {
+-			usb2_phy2: phy at 483e8000 {
 -				compatible = "ti,am437x-usb2";
 -				reg = <0x483e8000 0x8000>;
 -				syscon-phy-power = <&scm_conf 0x628>;
@@ -840,7 +840,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		dwc3_1: omap_dwc3@48380000 {
+-		dwc3_1: omap_dwc3 at 48380000 {
 -			compatible = "ti,am437x-dwc3";
 -			ti,hwmods = "usb_otg_ss0";
 -			reg = <0x48380000 0x10000>;
@@ -850,7 +850,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			utmi-mode = <1>;
 -			ranges;
 -
--			usb1: usb@48390000 {
+-			usb1: usb at 48390000 {
 -				compatible = "synopsys,dwc3";
 -				reg = <0x48390000 0x10000>;
 -				interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
@@ -869,7 +869,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
--		dwc3_2: omap_dwc3@483c0000 {
+-		dwc3_2: omap_dwc3 at 483c0000 {
 -			compatible = "ti,am437x-dwc3";
 -			ti,hwmods = "usb_otg_ss1";
 -			reg = <0x483c0000 0x10000>;
@@ -879,7 +879,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			utmi-mode = <1>;
 -			ranges;
 -
--			usb2: usb@483d0000 {
+-			usb2: usb at 483d0000 {
 -				compatible = "synopsys,dwc3";
 -				reg = <0x483d0000 0x10000>;
 -				interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
@@ -898,14 +898,14 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			};
 -		};
 -
- 		qspi: spi@47900000 {
+ 		qspi: spi at 47900000 {
  			compatible = "ti,am4372-qspi";
  			reg = <0x47900000 0x100>,
 @@ -1114,16 +299,6 @@
  			status = "disabled";
  		};
  
--		hdq: hdq@48347000 {
+-		hdq: hdq at 48347000 {
 -			compatible = "ti,am4372-hdq";
 -			reg = <0x48347000 0x1000>;
 -			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
- 		dss: dss@4832a000 {
+ 		dss: dss at 4832a000 {
  			compatible = "ti,omap3-dss";
  			reg = <0x4832a000 0x200>;
 @@ -1173,45 +348,8 @@
@@ -923,7 +923,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
  			};
  		};
 -
--		dcan0: can@481cc000 {
+-		dcan0: can at 481cc000 {
 -			compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 -			ti,hwmods = "d_can0";
 -			clocks = <&dcan0_fck>;
@@ -934,7 +934,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		dcan1: can@481d0000 {
+-		dcan1: can at 481d0000 {
 -			compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 -			ti,hwmods = "d_can1";
 -			clocks = <&dcan1_fck>;
@@ -945,7 +945,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		vpfe0: vpfe@48326000 {
+-		vpfe0: vpfe at 48326000 {
 -			compatible = "ti,am437x-vpfe";
 -			reg = <0x48326000 0x2000>;
 -			interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
@@ -953,7 +953,7 @@ diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
 -			status = "disabled";
 -		};
 -
--		vpfe1: vpfe@48328000 {
+-		vpfe1: vpfe at 48328000 {
 -			compatible = "ti,am437x-vpfe";
 -			reg = <0x48328000 0x2000>;
 -			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -971,7 +971,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 @@ -48,11 +48,29 @@
  		};
  
- 		target-module@f0000 {			/* 0x44df0000, ap 8 58.0 */
+ 		target-module at f0000 {			/* 0x44df0000, ap 8 58.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -981,7 +981,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0xf0000 0x10000>;
 +
-+			prcm: prcm@0 {
++			prcm: prcm at 0 {
 +				compatible = "ti,am4-prcm", "simple-bus";
 +				reg = <0x0 0x11000>;
 +				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
@@ -1005,7 +1005,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0x7000 0x1000>;
 +
-+			gpio0: gpio@0 {
++			gpio0: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -1017,26 +1017,26 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@9000 {			/* 0x44e09000, ap 16 04.0 */
+ 		target-module at 9000 {			/* 0x44e09000, ap 16 04.0 */
 @@ -156,6 +185,12 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x9000 0x1000>;
 +
-+			uart0: serial@0 {
++			uart0: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 +			};
  		};
  
- 		target-module@b000 {			/* 0x44e0b000, ap 18 48.0 */
+ 		target-module at b000 {			/* 0x44e0b000, ap 18 48.0 */
 @@ -180,6 +215,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xb000 0x1000>;
 +
-+			i2c0: i2c@0 {
++			i2c0: i2c at 0 {
 +				compatible = "ti,am4372-i2c","ti,omap4-i2c";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@@ -1046,13 +1046,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@d000 {			/* 0x44e0d000, ap 20 38.0 */
+ 		target-module at d000 {			/* 0x44e0d000, ap 20 38.0 */
 @@ -198,14 +242,94 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xd000 0x1000>;
 +
-+			tscadc: tscadc@0 {
++			tscadc: tscadc at 0 {
 +				compatible = "ti,am3359-tscadc";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
@@ -1074,7 +1074,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@10000 {			/* 0x44e10000, ap 22 0c.0 */
+ 		target-module at 10000 {			/* 0x44e10000, ap 22 0c.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -1084,20 +1084,20 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0x10000 0x10000>;
 +
-+			scm: scm@0 {
++			scm: scm at 0 {
 +				compatible = "ti,am4-scm", "simple-bus";
 +				reg = <0x0 0x4000>;
 +				#address-cells = <1>;
 +				#size-cells = <1>;
 +				ranges = <0 0 0x4000>;
 +
-+				phy_sel: cpsw-phy-sel@650 {
++				phy_sel: cpsw-phy-sel at 650 {
 +					compatible = "ti,am43xx-cpsw-phy-sel";
 +					reg= <0x650 0x4>;
 +					reg-names = "gmii-sel";
 +				};
 +
-+				am43xx_pinmux: pinmux@800 {
++				am43xx_pinmux: pinmux at 800 {
 +					compatible = "ti,am437-padconf",
 +						     "pinctrl-single";
 +					reg = <0x800 0x31c>;
@@ -1110,7 +1110,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					pinctrl-single,function-mask = <0xffffffff>;
 +				};
 +
-+				scm_conf: scm_conf@0 {
++				scm_conf: scm_conf at 0 {
 +					compatible = "syscon";
 +					reg = <0x0 0x800>;
 +					#address-cells = <1>;
@@ -1122,7 +1122,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					};
 +				};
 +
-+				wkup_m3_ipc: wkup_m3_ipc@1324 {
++				wkup_m3_ipc: wkup_m3_ipc at 1324 {
 +					compatible = "ti,am4372-wkup-m3-ipc";
 +					reg = <0x1324 0x44>;
 +					interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
@@ -1130,7 +1130,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					mboxes = <&mailbox &mbox_wkupm3>;
 +				};
 +
-+				edma_xbar: dma-router@f90 {
++				edma_xbar: dma-router at f90 {
 +					compatible = "ti,am335x-edma-crossbar";
 +					reg = <0xf90 0x40>;
 +					#dma-cells = <3>;
@@ -1143,13 +1143,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@31000 {			/* 0x44e31000, ap 24 40.0 */
+ 		target-module at 31000 {			/* 0x44e31000, ap 24 40.0 */
 @@ -228,6 +352,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x31000 0x1000>;
 +
-+			timer1: timer@0 {
++			timer1: timer at 0 {
 +				compatible = "ti,am4372-timer-1ms","ti,am335x-timer-1ms";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
@@ -1159,26 +1159,26 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@33000 {			/* 0x44e33000, ap 26 18.0 */
+ 		target-module at 33000 {			/* 0x44e33000, ap 26 18.0 */
 @@ -258,6 +391,12 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x35000 0x1000>;
 +
-+			wdt: wdt@0 {
++			wdt: wdt at 0 {
 +				compatible = "ti,am4372-wdt","ti,omap3-wdt";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
 +			};
  		};
  
- 		target-module@37000 {			/* 0x44e37000, ap 30 08.0 */
+ 		target-module at 37000 {			/* 0x44e37000, ap 30 08.0 */
 @@ -292,6 +431,18 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x3e000 0x1000>;
 +
-+			rtc: rtc@0 {
++			rtc: rtc at 0 {
 +				compatible = "ti,am4372-rtc", "ti,am3352-rtc",
 +					     "ti,da830-rtc";
 +				reg = <0x0 0x1000>;
@@ -1191,23 +1191,23 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@40000 {			/* 0x44e40000, ap 36 68.0 */
+ 		target-module at 40000 {			/* 0x44e40000, ap 36 68.0 */
 @@ -316,6 +467,11 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x86000 0x1000>;
 +
-+			counter32k: counter@0 {
++			counter32k: counter at 0 {
 +				compatible = "ti,am4372-counter32k","ti,omap-counter32k";
 +				reg = <0x0 0x40>;
 +			};
  		};
  
- 		target-module@88000 {			/* 0x44e88000, ap 38 12.0 */
+ 		target-module at 88000 {			/* 0x44e88000, ap 38 12.0 */
 @@ -355,11 +511,74 @@
  			 <0x00280000 0x00280000 0x001000>;	/* ap 8 */
  
- 		target-module@100000 {			/* 0x4a100000, ap 3 04.0 */
+ 		target-module at 100000 {			/* 0x4a100000, ap 3 04.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4-simple", "ti,sysc";
@@ -1228,7 +1228,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0x100000 0x8000>;
 +
-+			mac: ethernet@0 {
++			mac: ethernet at 0 {
 +				compatible = "ti,am4372-cpsw","ti,cpsw";
 +				reg = <0x0 0x800
 +				       0x1200 0x100>;
@@ -1256,7 +1256,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				syscon = <&scm_conf>;
 +				cpsw-phy-sel = <&phy_sel>;
 +
-+				davinci_mdio: mdio@1000 {
++				davinci_mdio: mdio at 1000 {
 +					compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
 +					reg = <0x1000 0x100>;
 +					#address-cells = <1>;
@@ -1268,25 +1268,25 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					status = "disabled";
 +				};
 +
-+				cpsw_emac0: slave@200 {
++				cpsw_emac0: slave at 200 {
 +					/* Filled in by U-Boot */
 +					mac-address = [ 00 00 00 00 00 00 ];
 +				};
 +
-+				cpsw_emac1: slave@300 {
++				cpsw_emac1: slave at 300 {
 +					/* Filled in by U-Boot */
 +					mac-address = [ 00 00 00 00 00 00 ];
 +				};
 +			};
  		};
  
- 		target-module@200000 {			/* 0x4a200000, ap 7 02.0 */
+ 		target-module at 200000 {			/* 0x4a200000, ap 7 02.0 */
 @@ -475,6 +694,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x22000 0x1000>;
 +
-+			uart1: serial@0 {
++			uart1: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@@ -1294,13 +1294,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@24000 {			/* 0x48024000, ap 10 1c.0 */
+ 		target-module at 24000 {			/* 0x48024000, ap 10 1c.0 */
 @@ -497,6 +723,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x24000 0x1000>;
 +
-+			uart2: serial@0 {
++			uart2: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
@@ -1308,13 +1308,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@2a000 {			/* 0x4802a000, ap 12 22.0 */
+ 		target-module at 2a000 {			/* 0x4802a000, ap 12 22.0 */
 @@ -521,6 +754,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x2a000 0x1000>;
 +
-+			i2c1: i2c@0 {
++			i2c1: i2c at 0 {
 +				compatible = "ti,am4372-i2c","ti,omap4-i2c";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
@@ -1324,13 +1324,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@30000 {			/* 0x48030000, ap 65 08.0 */
+ 		target-module at 30000 {			/* 0x48030000, ap 65 08.0 */
 @@ -543,6 +785,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x30000 0x1000>;
 +
-+			spi0: spi@0 {
++			spi0: spi at 0 {
 +				compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
@@ -1340,13 +1340,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@34000 {			/* 0x48034000, ap 80 56.0 */
+ 		target-module at 34000 {			/* 0x48034000, ap 80 56.0 */
 @@ -576,6 +827,20 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x38000 0x2000>;
 +
-+			mcasp0: mcasp@0 {
++			mcasp0: mcasp at 0 {
 +				compatible = "ti,am33xx-mcasp-audio";
 +				reg = <0x0 0x2000>,
 +				      <0x46000000 0x400000>;
@@ -1361,13 +1361,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@3c000 {			/* 0x4803c000, ap 16 2a.0 */
+ 		target-module at 3c000 {			/* 0x4803c000, ap 16 2a.0 */
 @@ -593,6 +858,20 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x3c000 0x2000>;
 +
-+			mcasp1: mcasp@0 {
++			mcasp1: mcasp at 0 {
 +				compatible = "ti,am33xx-mcasp-audio";
 +				reg = <0x0 0x2000>,
 +				      <0x46400000 0x400000>;
@@ -1382,13 +1382,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@40000 {			/* 0x48040000, ap 18 1e.0 */
+ 		target-module at 40000 {			/* 0x48040000, ap 18 1e.0 */
 @@ -613,6 +892,14 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x40000 0x1000>;
 +
-+			timer2: timer@0  {
++			timer2: timer at 0  {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
@@ -1397,13 +1397,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@42000 {			/* 0x48042000, ap 20 24.0 */
+ 		target-module at 42000 {			/* 0x48042000, ap 20 24.0 */
 @@ -633,6 +920,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x42000 0x1000>;
 +
-+			timer3: timer@0 {
++			timer3: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@@ -1411,13 +1411,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@44000 {			/* 0x48044000, ap 22 26.0 */
+ 		target-module at 44000 {			/* 0x48044000, ap 22 26.0 */
 @@ -653,6 +947,14 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x44000 0x1000>;
 +
-+			timer4: timer@0 {
++			timer4: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -1426,13 +1426,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@46000 {			/* 0x48046000, ap 24 28.0 */
+ 		target-module at 46000 {			/* 0x48046000, ap 24 28.0 */
 @@ -673,6 +975,14 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x46000 0x1000>;
 +
-+			timer5: timer@0 {
++			timer5: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -1441,13 +1441,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@48000 {			/* 0x48048000, ap 26 1a.0 */
+ 		target-module at 48000 {			/* 0x48048000, ap 26 1a.0 */
 @@ -693,6 +1003,14 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x48000 0x1000>;
 +
-+			timer6: timer@0 {
++			timer6: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -1456,13 +1456,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@4a000 {			/* 0x4804a000, ap 71 48.0 */
+ 		target-module at 4a000 {			/* 0x4804a000, ap 71 48.0 */
 @@ -713,6 +1031,14 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x4a000 0x1000>;
 +
-+			timer7: timer@0 {
++			timer7: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
@@ -1471,13 +1471,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@4c000 {			/* 0x4804c000, ap 28 36.0 */
+ 		target-module at 4c000 {			/* 0x4804c000, ap 28 36.0 */
 @@ -737,6 +1063,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x4c000 0x1000>;
 +
-+			gpio1: gpio@0 {
++			gpio1: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1489,13 +1489,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@60000 {			/* 0x48060000, ap 30 14.0 */
+ 		target-module at 60000 {			/* 0x48060000, ap 30 14.0 */
 @@ -760,6 +1097,18 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x60000 0x1000>;
 +
-+			mmc1: mmc@0 {
++			mmc1: mmc at 0 {
 +				compatible = "ti,omap4-hsmmc";
 +				reg = <0x0 0x1000>;
 +				ti,dual-volt;
@@ -1508,13 +1508,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@80000 {			/* 0x48080000, ap 32 18.0 */
+ 		target-module at 80000 {			/* 0x48080000, ap 32 18.0 */
 @@ -782,6 +1131,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x80000 0x10000>;
 +
-+			elm: elm@0 {
++			elm: elm at 0 {
 +				compatible = "ti,am3352-elm";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
@@ -1524,13 +1524,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@c8000 {			/* 0x480c8000, ap 73 06.0 */
+ 		target-module at c8000 {			/* 0x480c8000, ap 73 06.0 */
 @@ -800,6 +1158,20 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xc8000 0x1000>;
 +
-+			mailbox: mailbox@0 {
++			mailbox: mailbox at 0 {
 +				compatible = "ti,omap4-mailbox";
 +				reg = <0x0 0x200>;
 +				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -1545,13 +1545,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@ca000 {			/* 0x480ca000, ap 77 38.0 */
+ 		target-module at ca000 {			/* 0x480ca000, ap 77 38.0 */
 @@ -823,6 +1195,12 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xca000 0x1000>;
 +
-+			hwspinlock: spinlock@0 {
++			hwspinlock: spinlock at 0 {
 +				compatible = "ti,omap4-hwspinlock";
 +				reg = <0x0 0x1000>;
 +				#hwlock-cells = <1>;
@@ -1564,7 +1564,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0x9c000 0x1000>;
 +
-+			i2c2: i2c@0 {
++			i2c2: i2c at 0 {
 +				compatible = "ti,am4372-i2c","ti,omap4-i2c";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
@@ -1574,13 +1574,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a0000 {			/* 0x481a0000, ap 67 2c.0 */
+ 		target-module at a0000 {			/* 0x481a0000, ap 67 2c.0 */
 @@ -921,6 +1308,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa0000 0x1000>;
 +
-+			spi1: spi@0 {
++			spi1: spi at 0 {
 +				compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
@@ -1590,13 +1590,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a2000 {			/* 0x481a2000, ap 69 2e.0 */
+ 		target-module at a2000 {			/* 0x481a2000, ap 69 2e.0 */
 @@ -943,6 +1339,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa2000 0x1000>;
 +
-+			spi2: spi@0 {
++			spi2: spi at 0 {
 +				compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
@@ -1606,13 +1606,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a4000 {			/* 0x481a4000, ap 92 62.0 */
+ 		target-module at a4000 {			/* 0x481a4000, ap 92 62.0 */
 @@ -965,6 +1370,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa4000 0x1000>;
 +
-+			spi3: spi@0 {
++			spi3: spi at 0 {
 +				compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
@@ -1622,13 +1622,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a6000 {			/* 0x481a6000, ap 40 16.0 */
+ 		target-module at a6000 {			/* 0x481a6000, ap 40 16.0 */
 @@ -987,6 +1401,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa6000 0x1000>;
 +
-+			uart3: serial@0 {
++			uart3: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
@@ -1636,13 +1636,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a8000 {			/* 0x481a8000, ap 42 20.0 */
+ 		target-module at a8000 {			/* 0x481a8000, ap 42 20.0 */
 @@ -1009,6 +1430,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa8000 0x1000>;
 +
-+			uart4: serial@0 {
++			uart4: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -1650,13 +1650,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@aa000 {			/* 0x481aa000, ap 44 12.0 */
+ 		target-module at aa000 {			/* 0x481aa000, ap 44 12.0 */
 @@ -1031,6 +1459,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xaa000 0x1000>;
 +
-+			uart5: serial@0 {
++			uart5: serial at 0 {
 +				compatible = "ti,am4372-uart","ti,omap2-uart";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -1664,13 +1664,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@ac000 {			/* 0x481ac000, ap 46 30.0 */
+ 		target-module at ac000 {			/* 0x481ac000, ap 46 30.0 */
 @@ -1055,6 +1490,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xac000 0x1000>;
 +
-+			gpio2: gpio@0 {
++			gpio2: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
@@ -1682,13 +1682,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@ae000 {			/* 0x481ae000, ap 48 32.0 */
+ 		target-module at ae000 {			/* 0x481ae000, ap 48 32.0 */
 @@ -1079,6 +1525,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xae000 0x1000>;
 +
-+			gpio3: gpio@0 {
++			gpio3: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -1700,13 +1700,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@c1000 {			/* 0x481c1000, ap 94 68.0 */
+ 		target-module at c1000 {			/* 0x481c1000, ap 94 68.0 */
 @@ -1099,22 +1556,55 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xc1000 0x1000>;
 +
-+			timer8: timer@0 {
++			timer8: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -1714,7 +1714,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@cc000 {			/* 0x481cc000, ap 50 46.0 */
+ 		target-module at cc000 {			/* 0x481cc000, ap 50 46.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -1728,7 +1728,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0xcc000 0x2000>;
 +
-+			dcan0: can@0 {
++			dcan0: can at 0 {
 +				compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 +				reg = <0x0 0x2000>;
 +				syscon-raminit = <&scm_conf 0x644 0>;
@@ -1737,7 +1737,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@d0000 {			/* 0x481d0000, ap 52 3a.0 */
+ 		target-module at d0000 {			/* 0x481d0000, ap 52 3a.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -1751,7 +1751,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0xd0000 0x2000>;
 +
-+			dcan1: can@0 {
++			dcan1: can at 0 {
 +				compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 +				reg = <0x0 0x2000>;
 +				syscon-raminit = <&scm_conf 0x644 1>;
@@ -1760,13 +1760,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@d8000 {			/* 0x481d8000, ap 54 5e.0 */
+ 		target-module at d8000 {			/* 0x481d8000, ap 54 5e.0 */
 @@ -1138,6 +1628,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xd8000 0x1000>;
 +
-+			mmc2: mmc@0 {
++			mmc2: mmc at 0 {
 +				compatible = "ti,omap4-hsmmc";
 +				reg = <0x0 0x1000>;
 +				ti,needs-special-reset;
@@ -1784,7 +1784,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0x0 0x1000>;
 +
-+			epwmss0: epwmss@0 {
++			epwmss0: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1792,7 +1792,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ecap0: ecap@100 {
++				ecap0: ecap at 100 {
 +					compatible = "ti,am4372-ecap",
 +						     "ti,am3352-ecap",
 +						     "ti,am33xx-ecap";
@@ -1803,7 +1803,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					status = "disabled";
 +				};
 +
-+				ehrpwm0: pwm@200 {
++				ehrpwm0: pwm at 200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1816,13 +1816,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@2000 {			/* 0x48302000, ap 58 4a.0 */
+ 		target-module at 2000 {			/* 0x48302000, ap 58 4a.0 */
 @@ -1248,6 +1780,37 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x2000 0x1000>;
 +
-+			epwmss1: epwmss@0 {
++			epwmss1: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1830,7 +1830,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ecap1: ecap@100 {
++				ecap1: ecap at 100 {
 +					compatible = "ti,am4372-ecap",
 +						     "ti,am3352-ecap",
 +						     "ti,am33xx-ecap";
@@ -1841,7 +1841,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					status = "disabled";
 +				};
 +
-+				ehrpwm1: pwm@200 {
++				ehrpwm1: pwm at 200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1854,13 +1854,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@4000 {			/* 0x48304000, ap 60 44.0 */
+ 		target-module at 4000 {			/* 0x48304000, ap 60 44.0 */
 @@ -1270,6 +1833,37 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x4000 0x1000>;
 +
-+			epwmss2: epwmss@0 {
++			epwmss2: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1868,7 +1868,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ecap2: ecap@100 {
++				ecap2: ecap at 100 {
 +					compatible = "ti,am4372-ecap",
 +						     "ti,am3352-ecap",
 +						     "ti,am33xx-ecap";
@@ -1879,7 +1879,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +					status = "disabled";
 +				};
 +
-+				ehrpwm2: pwm@200 {
++				ehrpwm2: pwm at 200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1892,13 +1892,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@6000 {			/* 0x48306000, ap 96 58.0 */
+ 		target-module at 6000 {			/* 0x48306000, ap 96 58.0 */
 @@ -1292,6 +1886,26 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x6000 0x1000>;
 +
-+			epwmss3: epwmss@0 {
++			epwmss3: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1906,7 +1906,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ehrpwm3: pwm@200 {
++				ehrpwm3: pwm at 200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1919,13 +1919,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@8000 {			/* 0x48308000, ap 98 54.0 */
+ 		target-module at 8000 {			/* 0x48308000, ap 98 54.0 */
 @@ -1314,6 +1928,26 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x8000 0x1000>;
 +
-+			epwmss4: epwmss@0 {
++			epwmss4: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1933,7 +1933,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ehrpwm4: pwm@48308200 {
++				ehrpwm4: pwm at 48308200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1946,13 +1946,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a000 {			/* 0x4830a000, ap 100 60.0 */
+ 		target-module at a000 {			/* 0x4830a000, ap 100 60.0 */
 @@ -1336,6 +1970,26 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xa000 0x1000>;
 +
-+			epwmss5: epwmss@0 {
++			epwmss5: epwmss at 0 {
 +				compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
 +				reg = <0x0 0x10>;
 +				#address-cells = <1>;
@@ -1960,7 +1960,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				ranges = <0 0 0x1000>;
 +				status = "disabled";
 +
-+				ehrpwm5: pwm@200 {
++				ehrpwm5: pwm at 200 {
 +					compatible = "ti,am4372-ehrpwm",
 +						     "ti,am3352-ehrpwm",
 +						     "ti,am33xx-ehrpwm";
@@ -1973,26 +1973,26 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@10000 {			/* 0x48310000, ap 64 4e.1 */
+ 		target-module at 10000 {			/* 0x48310000, ap 64 4e.1 */
 @@ -1353,6 +2007,12 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x10000 0x2000>;
 +
-+			rng: rng@0 {
++			rng: rng at 0 {
 +				compatible = "ti,omap4-rng";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
 +			};
  		};
  
- 		target-module@13000 {			/* 0x48313000, ap 90 50.0 */
+ 		target-module at 13000 {			/* 0x48313000, ap 90 50.0 */
 @@ -1393,6 +2053,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x20000 0x1000>;
 +
-+			gpio4: gpio@0 {
++			gpio4: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
@@ -2004,13 +2004,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@22000 {			/* 0x48322000, ap 116 64.0 */
+ 		target-module at 22000 {			/* 0x48322000, ap 116 64.0 */
 @@ -1417,6 +2088,17 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x22000 0x1000>;
 +
-+			gpio5: gpio@0 {
++			gpio5: gpio at 0 {
 +				compatible = "ti,am4372-gpio","ti,omap4-gpio";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
@@ -2022,13 +2022,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@26000 {			/* 0x48326000, ap 86 66.0 */
+ 		target-module at 26000 {			/* 0x48326000, ap 86 66.0 */
 @@ -1437,6 +2119,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x26000 0x1000>;
 +
-+			vpfe0: vpfe@0 {
++			vpfe0: vpfe at 0 {
 +				compatible = "ti,am437x-vpfe";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
@@ -2036,13 +2036,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@28000 {			/* 0x48328000, ap 75 0e.0 */
+ 		target-module at 28000 {			/* 0x48328000, ap 75 0e.0 */
 @@ -1457,6 +2146,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x28000 0x1000>;
 +
-+			vpfe1: vpfe@0 {
++			vpfe1: vpfe at 0 {
 +				compatible = "ti,am437x-vpfe";
 +				reg = <0x0 0x2000>;
 +				interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -2050,13 +2050,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@2a000 {			/* 0x4832a000, ap 88 3c.0 */
+ 		target-module at 2a000 {			/* 0x4832a000, ap 88 3c.0 */
 @@ -1499,6 +2195,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x3d000 0x1000>;
 +
-+			timer9: timer@0 {
++			timer9: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
@@ -2064,13 +2064,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@3f000 {			/* 0x4833f000, ap 104 5c.0 */
+ 		target-module at 3f000 {			/* 0x4833f000, ap 104 5c.0 */
 @@ -1519,6 +2222,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x3f000 0x1000>;
 +
-+			timer10: timer@0 {
++			timer10: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
@@ -2078,13 +2078,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@41000 {			/* 0x48341000, ap 106 76.0 */
+ 		target-module at 41000 {			/* 0x48341000, ap 106 76.0 */
 @@ -1539,6 +2249,13 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x41000 0x1000>;
 +
-+			timer11: timer@0 {
++			timer11: timer at 0 {
 +				compatible = "ti,am4372-timer","ti,am335x-timer";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
@@ -2092,13 +2092,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@45000 {			/* 0x48345000, ap 108 6a.0 */
+ 		target-module at 45000 {			/* 0x48345000, ap 108 6a.0 */
 @@ -1561,6 +2278,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x45000 0x1000>;
 +
-+			spi4: spi@0 {
++			spi4: spi at 0 {
 +				compatible = "ti,am4372-mcspi","ti,omap4-mcspi";
 +				reg = <0x0 0x400>;
 +				interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
@@ -2108,13 +2108,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@47000 {			/* 0x48347000, ap 110 70.0 */
+ 		target-module at 47000 {			/* 0x48347000, ap 110 70.0 */
 @@ -1578,6 +2304,15 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x47000 0x1000>;
 +
-+			hdq: hdq@0 {
++			hdq: hdq at 0 {
 +				compatible = "ti,am4372-hdq";
 +				reg = <0x0 0x1000>;
 +				interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
@@ -2124,13 +2124,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@4c000 {			/* 0x4834c000, ap 114 72.0 */
+ 		target-module at 4c000 {			/* 0x4834c000, ap 114 72.0 */
 @@ -1609,14 +2344,65 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0x80000 0x20000>;
 +
-+			dwc3_1: omap_dwc3@0 {
++			dwc3_1: omap_dwc3 at 0 {
 +				compatible = "ti,am437x-dwc3";
 +				reg = <0x0 0x10000>;
 +				interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
@@ -2139,7 +2139,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				utmi-mode = <1>;
 +				ranges = <0 0 0x20000>;
 +
-+				usb1: usb@10000 {
++				usb1: usb at 10000 {
 +					compatible = "synopsys,dwc3";
 +					reg = <0x10000 0x10000>;
 +					interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
@@ -2159,7 +2159,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@a8000 {			/* 0x483a8000, ap 125 6c.0 */
+ 		target-module at a8000 {			/* 0x483a8000, ap 125 6c.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -2173,13 +2173,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0xa8000 0x8000>;
 +
-+			ocp2scp0: ocp2scp@0 {
++			ocp2scp0: ocp2scp at 0 {
 +				compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
 +				#address-cells = <1>;
 +				#size-cells = <1>;
 +				ranges = <0 0 0x8000>;
 +
-+				usb2_phy1: phy@8000 {
++				usb2_phy1: phy at 8000 {
 +					compatible = "ti,am437x-usb2";
 +					reg = <0x0 0x8000>;
 +					syscon-phy-power = <&scm_conf 0x620>;
@@ -2192,13 +2192,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@c0000 {			/* 0x483c0000, ap 127 7a.0 */
+ 		target-module at c0000 {			/* 0x483c0000, ap 127 7a.0 */
 @@ -1640,14 +2426,65 @@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges = <0x0 0xc0000 0x20000>;
 +
-+			dwc3_2: omap_dwc3@0 {
++			dwc3_2: omap_dwc3 at 0 {
 +				compatible = "ti,am437x-dwc3";
 +				reg = <0x0 0x10000>;
 +				interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
@@ -2207,7 +2207,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +				utmi-mode = <1>;
 +				ranges = <0 0 0x20000>;
 +
-+				usb2: usb@10000 {
++				usb2: usb at 10000 {
 +					compatible = "synopsys,dwc3";
 +					reg = <0x10000 0x10000>;
 +					interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
@@ -2227,7 +2227,7 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@e8000 {			/* 0x483e8000, ap 129 78.0 */
+ 		target-module at e8000 {			/* 0x483e8000, ap 129 78.0 */
 -			compatible = "ti,sysc";
 -			status = "disabled";
 +			compatible = "ti,sysc-omap4", "ti,sysc";
@@ -2241,13 +2241,13 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
  			#size-cells = <1>;
  			ranges = <0x0 0xe8000 0x8000>;
 +
-+			ocp2scp1: ocp2scp@0 {
++			ocp2scp1: ocp2scp at 0 {
 +				compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
 +				#address-cells = <1>;
 +				#size-cells = <1>;
 +				ranges = <0 0 0x8000>;
 +
-+				usb2_phy2: phy@8000 {
++				usb2_phy2: phy at 8000 {
 +					compatible = "ti,am437x-usb2";
 +					reg = <0x0 0x8000>;
 +					syscon-phy-power = <&scm_conf 0x628>;
@@ -2260,6 +2260,6 @@ diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
 +			};
  		};
  
- 		target-module@f2000 {			/* 0x483f2000, ap 112 5a.0 */
+ 		target-module at f2000 {			/* 0x483f2000, ap 112 5a.0 */
 -- 
 2.19.0
diff --git a/a/content_digest b/N1/content_digest
index 17d16f1..207dd82 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,8 @@
  "ref\020180925000545.22931-1-tony@atomide.com\0"
- "From\0Tony Lindgren <tony@atomide.com>\0"
+ "From\0tony@atomide.com (Tony Lindgren)\0"
  "Subject\0[PATCH 2/4] ARM: dts: am437x: Move l4 child devices to probe them with ti-sysc\0"
  "Date\0Mon, 24 Sep 2018 17:05:43 -0700\0"
- "To\0linux-omap@vger.kernel.org\0"
- "Cc\0devicetree@vger.kernel.org"
-  Dave Gerlach <d-gerlach@ti.com>
-  Keerthy <j-keerthy@ti.com>
-  Tero Kristo <t-kristo@ti.com>
- " Beno\303\256t Cousson <bcousson@baylibre.com>"
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "With l4 interconnect hierarchy and ti-sysc interconnect target module\n"
@@ -50,14 +44,14 @@
  " \t\tinterrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,\n"
  " \t\t\t     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;\n"
  " \n"
- "-\t\tl4_wkup: l4_wkup@44c00000 {\n"
+ "-\t\tl4_wkup: l4_wkup at 44c00000 {\n"
  "-\t\t\tcompatible = \"ti,am4-l4-wkup\", \"simple-bus\";\n"
  "-\t\t\t#address-cells = <1>;\n"
  "-\t\t\t#size-cells = <1>;\n"
  "-\t\t\tranges = <0 0x44c00000 0x287000>;\n"
  "-\n"
- "+\t\tl4_wkup: interconnect@44c00000 {\n"
- " \t\t\twkup_m3: wkup_m3@100000 {\n"
+ "+\t\tl4_wkup: interconnect at 44c00000 {\n"
+ " \t\t\twkup_m3: wkup_m3 at 100000 {\n"
  " \t\t\t\tcompatible = \"ti,am4372-wkup-m3\";\n"
  " \t\t\t\treg = <0x100000 0x4000>,\n"
  "@@ -173,75 +169,10 @@\n"
@@ -65,7 +59,7 @@
  " \t\t\t\tti,pm-firmware = \"am335x-pm-firmware.elf\";\n"
  " \t\t\t};\n"
  "-\n"
- "-\t\t\tprcm: prcm@1f0000 {\n"
+ "-\t\t\tprcm: prcm at 1f0000 {\n"
  "-\t\t\t\tcompatible = \"ti,am4-prcm\", \"simple-bus\";\n"
  "-\t\t\t\treg = <0x1f0000 0x11000>;\n"
  "-\t\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -82,14 +76,14 @@
  "-\t\t\t\t};\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tscm: scm@210000 {\n"
+ "-\t\t\tscm: scm at 210000 {\n"
  "-\t\t\t\tcompatible = \"ti,am4-scm\", \"simple-bus\";\n"
  "-\t\t\t\treg = <0x210000 0x4000>;\n"
  "-\t\t\t\t#address-cells = <1>;\n"
  "-\t\t\t\t#size-cells = <1>;\n"
  "-\t\t\t\tranges = <0 0x210000 0x4000>;\n"
  "-\n"
- "-\t\t\t\tam43xx_pinmux: pinmux@800 {\n"
+ "-\t\t\t\tam43xx_pinmux: pinmux at 800 {\n"
  "-\t\t\t\t\tcompatible = \"ti,am437-padconf\",\n"
  "-\t\t\t\t\t\t     \"pinctrl-single\";\n"
  "-\t\t\t\t\treg = <0x800 0x31c>;\n"
@@ -102,7 +96,7 @@
  "-\t\t\t\t\tpinctrl-single,function-mask = <0xffffffff>;\n"
  "-\t\t\t\t};\n"
  "-\n"
- "-\t\t\t\tscm_conf: scm_conf@0 {\n"
+ "-\t\t\t\tscm_conf: scm_conf at 0 {\n"
  "-\t\t\t\t\tcompatible = \"syscon\";\n"
  "-\t\t\t\t\treg = <0x0 0x800>;\n"
  "-\t\t\t\t\t#address-cells = <1>;\n"
@@ -114,7 +108,7 @@
  "-\t\t\t\t\t};\n"
  "-\t\t\t\t};\n"
  "-\n"
- "-\t\t\t\twkup_m3_ipc: wkup_m3_ipc@1324 {\n"
+ "-\t\t\t\twkup_m3_ipc: wkup_m3_ipc at 1324 {\n"
  "-\t\t\t\t\tcompatible = \"ti,am4372-wkup-m3-ipc\";\n"
  "-\t\t\t\t\treg = <0x1324 0x44>;\n"
  "-\t\t\t\t\tinterrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -122,7 +116,7 @@
  "-\t\t\t\t\tmboxes = <&mailbox &mbox_wkupm3>;\n"
  "-\t\t\t\t};\n"
  "-\n"
- "-\t\t\t\tedma_xbar: dma-router@f90 {\n"
+ "-\t\t\t\tedma_xbar: dma-router at f90 {\n"
  "-\t\t\t\t\tcompatible = \"ti,am335x-edma-crossbar\";\n"
  "-\t\t\t\t\treg = <0xf90 0x40>;\n"
  "-\t\t\t\t\t#dma-cells = <3>;\n"
@@ -134,24 +128,24 @@
  "-\t\t\t\t};\n"
  "-\t\t\t};\n"
  "+\t\t};\n"
- "+\t\tl4_per: interconnect@48000000 {\n"
+ "+\t\tl4_per: interconnect at 48000000 {\n"
  "+\t\t};\n"
- "+\t\tl4_fast: interconnect@4a000000 {\n"
+ "+\t\tl4_fast: interconnect at 4a000000 {\n"
  " \t\t};\n"
  " \n"
- " \t\temif: emif@4c000000 {\n"
+ " \t\temif: emif at 4c000000 {\n"
  "@@ -297,333 +228,6 @@\n"
  " \t\t\tinterrupt-names = \"edma3_tcerrint\";\n"
  " \t\t};\n"
  " \n"
- "-\t\tuart0: serial@44e09000 {\n"
+ "-\t\tuart0: serial at 44e09000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x44e09000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;\n"
  "-\t\t\tti,hwmods = \"uart1\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tuart1: serial@48022000 {\n"
+ "-\t\tuart1: serial at 48022000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x48022000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -159,7 +153,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tuart2: serial@48024000 {\n"
+ "-\t\tuart2: serial at 48024000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x48024000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -167,7 +161,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tuart3: serial@481a6000 {\n"
+ "-\t\tuart3: serial at 481a6000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x481a6000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -175,7 +169,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tuart4: serial@481a8000 {\n"
+ "-\t\tuart4: serial at 481a8000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x481a8000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -183,7 +177,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tuart5: serial@481aa000 {\n"
+ "-\t\tuart5: serial at 481aa000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "-\t\t\treg = <0x481aa000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -191,7 +185,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmailbox: mailbox@480c8000 {\n"
+ "-\t\tmailbox: mailbox at 480c8000 {\n"
  "-\t\t\tcompatible = \"ti,omap4-mailbox\";\n"
  "-\t\t\treg = <0x480C8000 0x200>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -206,7 +200,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer1: timer@44e31000 {\n"
+ "-\t\ttimer1: timer at 44e31000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer-1ms\",\"ti,am335x-timer-1ms\";\n"
  "-\t\t\treg = <0x44e31000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -216,7 +210,7 @@
  "-\t\t\tclock-names = \"fck\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer2: timer@48040000  {\n"
+ "-\t\ttimer2: timer at 48040000  {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48040000  0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -225,7 +219,7 @@
  "-\t\t\tclock-names = \"fck\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer3: timer@48042000 {\n"
+ "-\t\ttimer3: timer at 48042000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48042000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -233,7 +227,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer4: timer@48044000 {\n"
+ "-\t\ttimer4: timer at 48044000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48044000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -242,7 +236,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer5: timer@48046000 {\n"
+ "-\t\ttimer5: timer at 48046000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48046000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -251,7 +245,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer6: timer@48048000 {\n"
+ "-\t\ttimer6: timer at 48048000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48048000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -260,7 +254,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer7: timer@4804a000 {\n"
+ "-\t\ttimer7: timer at 4804a000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x4804a000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -269,7 +263,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer8: timer@481c1000 {\n"
+ "-\t\ttimer8: timer at 481c1000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x481c1000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -277,7 +271,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer9: timer@4833d000 {\n"
+ "-\t\ttimer9: timer at 4833d000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x4833d000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -285,7 +279,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer10: timer@4833f000 {\n"
+ "-\t\ttimer10: timer at 4833f000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x4833f000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -293,7 +287,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttimer11: timer@48341000 {\n"
+ "-\t\ttimer11: timer at 48341000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "-\t\t\treg = <0x48341000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -301,13 +295,13 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tcounter32k: counter@44e86000 {\n"
+ "-\t\tcounter32k: counter at 44e86000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-counter32k\",\"ti,omap-counter32k\";\n"
  "-\t\t\treg = <0x44e86000 0x40>;\n"
  "-\t\t\tti,hwmods = \"counter_32k\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\trtc: rtc@44e3e000 {\n"
+ "-\t\trtc: rtc at 44e3e000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-rtc\", \"ti,am3352-rtc\",\n"
  "-\t\t\t\t     \"ti,da830-rtc\";\n"
  "-\t\t\treg = <0x44e3e000 0x1000>;\n"
@@ -320,14 +314,14 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\twdt: wdt@44e35000 {\n"
+ "-\t\twdt: wdt at 44e35000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-wdt\",\"ti,omap3-wdt\";\n"
  "-\t\t\treg = <0x44e35000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;\n"
  "-\t\t\tti,hwmods = \"wd_timer2\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio0: gpio@44e07000 {\n"
+ "-\t\tgpio0: gpio at 44e07000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x44e07000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -339,7 +333,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio1: gpio@4804c000 {\n"
+ "-\t\tgpio1: gpio at 4804c000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x4804c000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -351,7 +345,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio2: gpio@481ac000 {\n"
+ "-\t\tgpio2: gpio at 481ac000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x481ac000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -363,7 +357,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio3: gpio@481ae000 {\n"
+ "-\t\tgpio3: gpio at 481ae000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x481ae000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -375,7 +369,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio4: gpio@48320000 {\n"
+ "-\t\tgpio4: gpio at 48320000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x48320000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -387,7 +381,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tgpio5: gpio@48322000 {\n"
+ "-\t\tgpio5: gpio at 48322000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "-\t\t\treg = <0x48322000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -399,14 +393,14 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\thwspinlock: spinlock@480ca000 {\n"
+ "-\t\thwspinlock: spinlock at 480ca000 {\n"
  "-\t\t\tcompatible = \"ti,omap4-hwspinlock\";\n"
  "-\t\t\treg = <0x480ca000 0x1000>;\n"
  "-\t\t\tti,hwmods = \"spinlock\";\n"
  "-\t\t\t#hwlock-cells = <1>;\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ti2c0: i2c@44e0b000 {\n"
+ "-\t\ti2c0: i2c at 44e0b000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "-\t\t\treg = <0x44e0b000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -416,7 +410,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ti2c1: i2c@4802a000 {\n"
+ "-\t\ti2c1: i2c at 4802a000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "-\t\t\treg = <0x4802a000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -426,7 +420,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ti2c2: i2c@4819c000 {\n"
+ "-\t\ti2c2: i2c at 4819c000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "-\t\t\treg = <0x4819c000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -436,7 +430,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tspi0: spi@48030000 {\n"
+ "-\t\tspi0: spi at 48030000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "-\t\t\treg = <0x48030000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -446,7 +440,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmmc1: mmc@48060000 {\n"
+ "-\t\tmmc1: mmc at 48060000 {\n"
  "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n"
  "-\t\t\treg = <0x48060000 0x1000>;\n"
  "-\t\t\tti,hwmods = \"mmc1\";\n"
@@ -459,7 +453,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmmc2: mmc@481d8000 {\n"
+ "-\t\tmmc2: mmc at 481d8000 {\n"
  "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n"
  "-\t\t\treg = <0x481d8000 0x1000>;\n"
  "-\t\t\tti,hwmods = \"mmc2\";\n"
@@ -471,14 +465,14 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- " \t\tmmc3: mmc@47810000 {\n"
+ " \t\tmmc3: mmc at 47810000 {\n"
  " \t\t\tcompatible = \"ti,omap4-hsmmc\";\n"
  " \t\t\treg = <0x47810000 0x1000>;\n"
  "@@ -633,282 +237,6 @@\n"
  " \t\t\tstatus = \"disabled\";\n"
  " \t\t};\n"
  " \n"
- "-\t\tspi1: spi@481a0000 {\n"
+ "-\t\tspi1: spi at 481a0000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "-\t\t\treg = <0x481a0000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -488,7 +482,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tspi2: spi@481a2000 {\n"
+ "-\t\tspi2: spi at 481a2000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "-\t\t\treg = <0x481a2000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -498,7 +492,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tspi3: spi@481a4000 {\n"
+ "-\t\tspi3: spi at 481a4000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "-\t\t\treg = <0x481a4000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -508,7 +502,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tspi4: spi@48345000 {\n"
+ "-\t\tspi4: spi at 48345000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "-\t\t\treg = <0x48345000 0x400>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -518,7 +512,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmac: ethernet@4a100000 {\n"
+ "-\t\tmac: ethernet at 4a100000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-cpsw\",\"ti,cpsw\";\n"
  "-\t\t\treg = <0x4a100000 0x800\n"
  "-\t\t\t       0x4a101200 0x100>;\n"
@@ -546,7 +540,7 @@
  "-\t\t\tranges;\n"
  "-\t\t\tsyscon = <&scm_conf>;\n"
  "-\n"
- "-\t\t\tdavinci_mdio: mdio@4a101000 {\n"
+ "-\t\t\tdavinci_mdio: mdio at 4a101000 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-mdio\",\"ti,cpsw-mdio\",\"ti,davinci_mdio\";\n"
  "-\t\t\t\treg = <0x4a101000 0x100>;\n"
  "-\t\t\t\t#address-cells = <1>;\n"
@@ -556,24 +550,24 @@
  "-\t\t\t\tstatus = \"disabled\";\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tcpsw_emac0: slave@4a100200 {\n"
+ "-\t\t\tcpsw_emac0: slave at 4a100200 {\n"
  "-\t\t\t\t/* Filled in by U-Boot */\n"
  "-\t\t\t\tmac-address = [ 00 00 00 00 00 00 ];\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tcpsw_emac1: slave@4a100300 {\n"
+ "-\t\t\tcpsw_emac1: slave at 4a100300 {\n"
  "-\t\t\t\t/* Filled in by U-Boot */\n"
  "-\t\t\t\tmac-address = [ 00 00 00 00 00 00 ];\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tphy_sel: cpsw-phy-sel@44e10650 {\n"
+ "-\t\t\tphy_sel: cpsw-phy-sel at 44e10650 {\n"
  "-\t\t\t\tcompatible = \"ti,am43xx-cpsw-phy-sel\";\n"
  "-\t\t\t\treg= <0x44e10650 0x4>;\n"
  "-\t\t\t\treg-names = \"gmii-sel\";\n"
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss0: epwmss@48300000 {\n"
+ "-\t\tepwmss0: epwmss at 48300000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x48300000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -582,7 +576,7 @@
  "-\t\t\tti,hwmods = \"epwmss0\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tecap0: ecap@48300100 {\n"
+ "-\t\t\tecap0: ecap at 48300100 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -593,7 +587,7 @@
  "-\t\t\t\tstatus = \"disabled\";\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tehrpwm0: pwm@48300200 {\n"
+ "-\t\t\tehrpwm0: pwm at 48300200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -605,7 +599,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss1: epwmss@48302000 {\n"
+ "-\t\tepwmss1: epwmss at 48302000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x48302000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -614,7 +608,7 @@
  "-\t\t\tti,hwmods = \"epwmss1\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tecap1: ecap@48302100 {\n"
+ "-\t\t\tecap1: ecap at 48302100 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -625,7 +619,7 @@
  "-\t\t\t\tstatus = \"disabled\";\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tehrpwm1: pwm@48302200 {\n"
+ "-\t\t\tehrpwm1: pwm at 48302200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -637,7 +631,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss2: epwmss@48304000 {\n"
+ "-\t\tepwmss2: epwmss at 48304000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x48304000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -646,7 +640,7 @@
  "-\t\t\tti,hwmods = \"epwmss2\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tecap2: ecap@48304100 {\n"
+ "-\t\t\tecap2: ecap at 48304100 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -657,7 +651,7 @@
  "-\t\t\t\tstatus = \"disabled\";\n"
  "-\t\t\t};\n"
  "-\n"
- "-\t\t\tehrpwm2: pwm@48304200 {\n"
+ "-\t\t\tehrpwm2: pwm at 48304200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -669,7 +663,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss3: epwmss@48306000 {\n"
+ "-\t\tepwmss3: epwmss at 48306000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x48306000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -678,7 +672,7 @@
  "-\t\t\tti,hwmods = \"epwmss3\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tehrpwm3: pwm@48306200 {\n"
+ "-\t\t\tehrpwm3: pwm at 48306200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -690,7 +684,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss4: epwmss@48308000 {\n"
+ "-\t\tepwmss4: epwmss at 48308000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x48308000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -699,7 +693,7 @@
  "-\t\t\tti,hwmods = \"epwmss4\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tehrpwm4: pwm@48308200 {\n"
+ "-\t\t\tehrpwm4: pwm at 48308200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -711,7 +705,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tepwmss5: epwmss@4830a000 {\n"
+ "-\t\tepwmss5: epwmss at 4830a000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "-\t\t\treg = <0x4830a000 0x10>;\n"
  "-\t\t\t#address-cells = <1>;\n"
@@ -720,7 +714,7 @@
  "-\t\t\tti,hwmods = \"epwmss5\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "-\n"
- "-\t\t\tehrpwm5: pwm@4830a200 {\n"
+ "-\t\t\tehrpwm5: pwm at 4830a200 {\n"
  "-\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "-\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -732,7 +726,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\ttscadc: tscadc@44e0d000 {\n"
+ "-\t\ttscadc: tscadc at 44e0d000 {\n"
  "-\t\t\tcompatible = \"ti,am3359-tscadc\";\n"
  "-\t\t\treg = <0x44e0d000 0x1000>;\n"
  "-\t\t\tti,hwmods = \"adc_tsc\";\n"
@@ -754,21 +748,21 @@
  "-\n"
  "-\t\t};\n"
  "-\n"
- " \t\tsham: sham@53100000 {\n"
+ " \t\tsham: sham at 53100000 {\n"
  " \t\t\tcompatible = \"ti,omap5-sham\";\n"
  " \t\t\tti,hwmods = \"sham\";\n"
  "@@ -938,53 +266,6 @@\n"
  " \t\t\tdma-names = \"tx\", \"rx\";\n"
  " \t\t};\n"
  " \n"
- "-\t\trng: rng@48310000 {\n"
+ "-\t\trng: rng at 48310000 {\n"
  "-\t\t\tcompatible = \"ti,omap4-rng\";\n"
  "-\t\t\tti,hwmods = \"rng\";\n"
  "-\t\t\treg = <0x48310000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmcasp0: mcasp@48038000 {\n"
+ "-\t\tmcasp0: mcasp at 48038000 {\n"
  "-\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n"
  "-\t\t\tti,hwmods = \"mcasp0\";\n"
  "-\t\t\treg = <0x48038000 0x2000>,\n"
@@ -783,7 +777,7 @@
  "-\t\t\tdma-names = \"tx\", \"rx\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tmcasp1: mcasp@4803c000 {\n"
+ "-\t\tmcasp1: mcasp at 4803c000 {\n"
  "-\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n"
  "-\t\t\tti,hwmods = \"mcasp1\";\n"
  "-\t\t\treg = <0x4803C000 0x2000>,\n"
@@ -798,7 +792,7 @@
  "-\t\t\tdma-names = \"tx\", \"rx\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\telm: elm@48080000 {\n"
+ "-\t\telm: elm at 48080000 {\n"
  "-\t\t\tcompatible = \"ti,am3352-elm\";\n"
  "-\t\t\treg = <0x48080000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -808,21 +802,21 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- " \t\tgpmc: gpmc@50000000 {\n"
+ " \t\tgpmc: gpmc at 50000000 {\n"
  " \t\t\tcompatible = \"ti,am3352-gpmc\";\n"
  " \t\t\tti,hwmods = \"gpmc\";\n"
  "@@ -1005,102 +286,6 @@\n"
  " \t\t\tstatus = \"disabled\";\n"
  " \t\t};\n"
  " \n"
- "-\t\tocp2scp0: ocp2scp@483a8000 {\n"
+ "-\t\tocp2scp0: ocp2scp at 483a8000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-ocp2scp\", \"ti,omap-ocp2scp\";\n"
  "-\t\t\t#address-cells = <1>;\n"
  "-\t\t\t#size-cells = <1>;\n"
  "-\t\t\tranges;\n"
  "-\t\t\tti,hwmods = \"ocp2scp0\";\n"
  "-\n"
- "-\t\t\tusb2_phy1: phy@483a8000 {\n"
+ "-\t\t\tusb2_phy1: phy at 483a8000 {\n"
  "-\t\t\t\tcompatible = \"ti,am437x-usb2\";\n"
  "-\t\t\t\treg = <0x483a8000 0x8000>;\n"
  "-\t\t\t\tsyscon-phy-power = <&scm_conf 0x620>;\n"
@@ -834,14 +828,14 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tocp2scp1: ocp2scp@483e8000 {\n"
+ "-\t\tocp2scp1: ocp2scp at 483e8000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-ocp2scp\", \"ti,omap-ocp2scp\";\n"
  "-\t\t\t#address-cells = <1>;\n"
  "-\t\t\t#size-cells = <1>;\n"
  "-\t\t\tranges;\n"
  "-\t\t\tti,hwmods = \"ocp2scp1\";\n"
  "-\n"
- "-\t\t\tusb2_phy2: phy@483e8000 {\n"
+ "-\t\t\tusb2_phy2: phy at 483e8000 {\n"
  "-\t\t\t\tcompatible = \"ti,am437x-usb2\";\n"
  "-\t\t\t\treg = <0x483e8000 0x8000>;\n"
  "-\t\t\t\tsyscon-phy-power = <&scm_conf 0x628>;\n"
@@ -853,7 +847,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tdwc3_1: omap_dwc3@48380000 {\n"
+ "-\t\tdwc3_1: omap_dwc3 at 48380000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-dwc3\";\n"
  "-\t\t\tti,hwmods = \"usb_otg_ss0\";\n"
  "-\t\t\treg = <0x48380000 0x10000>;\n"
@@ -863,7 +857,7 @@
  "-\t\t\tutmi-mode = <1>;\n"
  "-\t\t\tranges;\n"
  "-\n"
- "-\t\t\tusb1: usb@48390000 {\n"
+ "-\t\t\tusb1: usb at 48390000 {\n"
  "-\t\t\t\tcompatible = \"synopsys,dwc3\";\n"
  "-\t\t\t\treg = <0x48390000 0x10000>;\n"
  "-\t\t\t\tinterrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,\n"
@@ -882,7 +876,7 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tdwc3_2: omap_dwc3@483c0000 {\n"
+ "-\t\tdwc3_2: omap_dwc3 at 483c0000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-dwc3\";\n"
  "-\t\t\tti,hwmods = \"usb_otg_ss1\";\n"
  "-\t\t\treg = <0x483c0000 0x10000>;\n"
@@ -892,7 +886,7 @@
  "-\t\t\tutmi-mode = <1>;\n"
  "-\t\t\tranges;\n"
  "-\n"
- "-\t\t\tusb2: usb@483d0000 {\n"
+ "-\t\t\tusb2: usb at 483d0000 {\n"
  "-\t\t\t\tcompatible = \"synopsys,dwc3\";\n"
  "-\t\t\t\treg = <0x483d0000 0x10000>;\n"
  "-\t\t\t\tinterrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,\n"
@@ -911,14 +905,14 @@
  "-\t\t\t};\n"
  "-\t\t};\n"
  "-\n"
- " \t\tqspi: spi@47900000 {\n"
+ " \t\tqspi: spi at 47900000 {\n"
  " \t\t\tcompatible = \"ti,am4372-qspi\";\n"
  " \t\t\treg = <0x47900000 0x100>,\n"
  "@@ -1114,16 +299,6 @@\n"
  " \t\t\tstatus = \"disabled\";\n"
  " \t\t};\n"
  " \n"
- "-\t\thdq: hdq@48347000 {\n"
+ "-\t\thdq: hdq at 48347000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-hdq\";\n"
  "-\t\t\treg = <0x48347000 0x1000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -928,7 +922,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- " \t\tdss: dss@4832a000 {\n"
+ " \t\tdss: dss at 4832a000 {\n"
  " \t\t\tcompatible = \"ti,omap3-dss\";\n"
  " \t\t\treg = <0x4832a000 0x200>;\n"
  "@@ -1173,45 +348,8 @@\n"
@@ -936,7 +930,7 @@
  " \t\t\t};\n"
  " \t\t};\n"
  "-\n"
- "-\t\tdcan0: can@481cc000 {\n"
+ "-\t\tdcan0: can at 481cc000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-d_can\", \"ti,am3352-d_can\";\n"
  "-\t\t\tti,hwmods = \"d_can0\";\n"
  "-\t\t\tclocks = <&dcan0_fck>;\n"
@@ -947,7 +941,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tdcan1: can@481d0000 {\n"
+ "-\t\tdcan1: can at 481d0000 {\n"
  "-\t\t\tcompatible = \"ti,am4372-d_can\", \"ti,am3352-d_can\";\n"
  "-\t\t\tti,hwmods = \"d_can1\";\n"
  "-\t\t\tclocks = <&dcan1_fck>;\n"
@@ -958,7 +952,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tvpfe0: vpfe@48326000 {\n"
+ "-\t\tvpfe0: vpfe at 48326000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-vpfe\";\n"
  "-\t\t\treg = <0x48326000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -966,7 +960,7 @@
  "-\t\t\tstatus = \"disabled\";\n"
  "-\t\t};\n"
  "-\n"
- "-\t\tvpfe1: vpfe@48328000 {\n"
+ "-\t\tvpfe1: vpfe at 48328000 {\n"
  "-\t\t\tcompatible = \"ti,am437x-vpfe\";\n"
  "-\t\t\treg = <0x48328000 0x2000>;\n"
  "-\t\t\tinterrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -984,7 +978,7 @@
  "@@ -48,11 +48,29 @@\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@f0000 {\t\t\t/* 0x44df0000, ap 8 58.0 */\n"
+ " \t\ttarget-module at f0000 {\t\t\t/* 0x44df0000, ap 8 58.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -994,7 +988,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xf0000 0x10000>;\n"
  "+\n"
- "+\t\t\tprcm: prcm@0 {\n"
+ "+\t\t\tprcm: prcm at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4-prcm\", \"simple-bus\";\n"
  "+\t\t\t\treg = <0x0 0x11000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1018,7 +1012,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x7000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio0: gpio@0 {\n"
+ "+\t\t\tgpio0: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1030,26 +1024,26 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@9000 {\t\t\t/* 0x44e09000, ap 16 04.0 */\n"
+ " \t\ttarget-module at 9000 {\t\t\t/* 0x44e09000, ap 16 04.0 */\n"
  "@@ -156,6 +185,12 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x9000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart0: serial@0 {\n"
+ "+\t\t\tuart0: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;\n"
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@b000 {\t\t\t/* 0x44e0b000, ap 18 48.0 */\n"
+ " \t\ttarget-module at b000 {\t\t\t/* 0x44e0b000, ap 18 48.0 */\n"
  "@@ -180,6 +215,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xb000 0x1000>;\n"
  "+\n"
- "+\t\t\ti2c0: i2c@0 {\n"
+ "+\t\t\ti2c0: i2c at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1059,13 +1053,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@d000 {\t\t\t/* 0x44e0d000, ap 20 38.0 */\n"
+ " \t\ttarget-module at d000 {\t\t\t/* 0x44e0d000, ap 20 38.0 */\n"
  "@@ -198,14 +242,94 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xd000 0x1000>;\n"
  "+\n"
- "+\t\t\ttscadc: tscadc@0 {\n"
+ "+\t\t\ttscadc: tscadc at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am3359-tscadc\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1087,7 +1081,7 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@10000 {\t\t\t/* 0x44e10000, ap 22 0c.0 */\n"
+ " \t\ttarget-module at 10000 {\t\t\t/* 0x44e10000, ap 22 0c.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -1097,20 +1091,20 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x10000 0x10000>;\n"
  "+\n"
- "+\t\t\tscm: scm@0 {\n"
+ "+\t\t\tscm: scm at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4-scm\", \"simple-bus\";\n"
  "+\t\t\t\treg = <0x0 0x4000>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\tranges = <0 0 0x4000>;\n"
  "+\n"
- "+\t\t\t\tphy_sel: cpsw-phy-sel@650 {\n"
+ "+\t\t\t\tphy_sel: cpsw-phy-sel at 650 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am43xx-cpsw-phy-sel\";\n"
  "+\t\t\t\t\treg= <0x650 0x4>;\n"
  "+\t\t\t\t\treg-names = \"gmii-sel\";\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tam43xx_pinmux: pinmux@800 {\n"
+ "+\t\t\t\tam43xx_pinmux: pinmux at 800 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am437-padconf\",\n"
  "+\t\t\t\t\t\t     \"pinctrl-single\";\n"
  "+\t\t\t\t\treg = <0x800 0x31c>;\n"
@@ -1123,7 +1117,7 @@
  "+\t\t\t\t\tpinctrl-single,function-mask = <0xffffffff>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tscm_conf: scm_conf@0 {\n"
+ "+\t\t\t\tscm_conf: scm_conf at 0 {\n"
  "+\t\t\t\t\tcompatible = \"syscon\";\n"
  "+\t\t\t\t\treg = <0x0 0x800>;\n"
  "+\t\t\t\t\t#address-cells = <1>;\n"
@@ -1135,7 +1129,7 @@
  "+\t\t\t\t\t};\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\twkup_m3_ipc: wkup_m3_ipc@1324 {\n"
+ "+\t\t\t\twkup_m3_ipc: wkup_m3_ipc at 1324 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-wkup-m3-ipc\";\n"
  "+\t\t\t\t\treg = <0x1324 0x44>;\n"
  "+\t\t\t\t\tinterrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1143,7 +1137,7 @@
  "+\t\t\t\t\tmboxes = <&mailbox &mbox_wkupm3>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tedma_xbar: dma-router@f90 {\n"
+ "+\t\t\t\tedma_xbar: dma-router at f90 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am335x-edma-crossbar\";\n"
  "+\t\t\t\t\treg = <0xf90 0x40>;\n"
  "+\t\t\t\t\t#dma-cells = <3>;\n"
@@ -1156,13 +1150,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@31000 {\t\t\t/* 0x44e31000, ap 24 40.0 */\n"
+ " \t\ttarget-module at 31000 {\t\t\t/* 0x44e31000, ap 24 40.0 */\n"
  "@@ -228,6 +352,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x31000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer1: timer@0 {\n"
+ "+\t\t\ttimer1: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer-1ms\",\"ti,am335x-timer-1ms\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1172,26 +1166,26 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@33000 {\t\t\t/* 0x44e33000, ap 26 18.0 */\n"
+ " \t\ttarget-module at 33000 {\t\t\t/* 0x44e33000, ap 26 18.0 */\n"
  "@@ -258,6 +391,12 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x35000 0x1000>;\n"
  "+\n"
- "+\t\t\twdt: wdt@0 {\n"
+ "+\t\t\twdt: wdt at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-wdt\",\"ti,omap3-wdt\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;\n"
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@37000 {\t\t\t/* 0x44e37000, ap 30 08.0 */\n"
+ " \t\ttarget-module at 37000 {\t\t\t/* 0x44e37000, ap 30 08.0 */\n"
  "@@ -292,6 +431,18 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x3e000 0x1000>;\n"
  "+\n"
- "+\t\t\trtc: rtc@0 {\n"
+ "+\t\t\trtc: rtc at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-rtc\", \"ti,am3352-rtc\",\n"
  "+\t\t\t\t\t     \"ti,da830-rtc\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
@@ -1204,23 +1198,23 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@40000 {\t\t\t/* 0x44e40000, ap 36 68.0 */\n"
+ " \t\ttarget-module at 40000 {\t\t\t/* 0x44e40000, ap 36 68.0 */\n"
  "@@ -316,6 +467,11 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x86000 0x1000>;\n"
  "+\n"
- "+\t\t\tcounter32k: counter@0 {\n"
+ "+\t\t\tcounter32k: counter at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-counter32k\",\"ti,omap-counter32k\";\n"
  "+\t\t\t\treg = <0x0 0x40>;\n"
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@88000 {\t\t\t/* 0x44e88000, ap 38 12.0 */\n"
+ " \t\ttarget-module at 88000 {\t\t\t/* 0x44e88000, ap 38 12.0 */\n"
  "@@ -355,11 +511,74 @@\n"
  " \t\t\t <0x00280000 0x00280000 0x001000>;\t/* ap 8 */\n"
  " \n"
- " \t\ttarget-module@100000 {\t\t\t/* 0x4a100000, ap 3 04.0 */\n"
+ " \t\ttarget-module at 100000 {\t\t\t/* 0x4a100000, ap 3 04.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n"
@@ -1241,7 +1235,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x100000 0x8000>;\n"
  "+\n"
- "+\t\t\tmac: ethernet@0 {\n"
+ "+\t\t\tmac: ethernet at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-cpsw\",\"ti,cpsw\";\n"
  "+\t\t\t\treg = <0x0 0x800\n"
  "+\t\t\t\t       0x1200 0x100>;\n"
@@ -1269,7 +1263,7 @@
  "+\t\t\t\tsyscon = <&scm_conf>;\n"
  "+\t\t\t\tcpsw-phy-sel = <&phy_sel>;\n"
  "+\n"
- "+\t\t\t\tdavinci_mdio: mdio@1000 {\n"
+ "+\t\t\t\tdavinci_mdio: mdio at 1000 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-mdio\",\"ti,cpsw-mdio\",\"ti,davinci_mdio\";\n"
  "+\t\t\t\t\treg = <0x1000 0x100>;\n"
  "+\t\t\t\t\t#address-cells = <1>;\n"
@@ -1281,25 +1275,25 @@
  "+\t\t\t\t\tstatus = \"disabled\";\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tcpsw_emac0: slave@200 {\n"
+ "+\t\t\t\tcpsw_emac0: slave at 200 {\n"
  "+\t\t\t\t\t/* Filled in by U-Boot */\n"
  "+\t\t\t\t\tmac-address = [ 00 00 00 00 00 00 ];\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tcpsw_emac1: slave@300 {\n"
+ "+\t\t\t\tcpsw_emac1: slave at 300 {\n"
  "+\t\t\t\t\t/* Filled in by U-Boot */\n"
  "+\t\t\t\t\tmac-address = [ 00 00 00 00 00 00 ];\n"
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@200000 {\t\t\t/* 0x4a200000, ap 7 02.0 */\n"
+ " \t\ttarget-module at 200000 {\t\t\t/* 0x4a200000, ap 7 02.0 */\n"
  "@@ -475,6 +694,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x22000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart1: serial@0 {\n"
+ "+\t\t\tuart1: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1307,13 +1301,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@24000 {\t\t\t/* 0x48024000, ap 10 1c.0 */\n"
+ " \t\ttarget-module at 24000 {\t\t\t/* 0x48024000, ap 10 1c.0 */\n"
  "@@ -497,6 +723,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x24000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart2: serial@0 {\n"
+ "+\t\t\tuart2: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1321,13 +1315,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@2a000 {\t\t\t/* 0x4802a000, ap 12 22.0 */\n"
+ " \t\ttarget-module at 2a000 {\t\t\t/* 0x4802a000, ap 12 22.0 */\n"
  "@@ -521,6 +754,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x2a000 0x1000>;\n"
  "+\n"
- "+\t\t\ti2c1: i2c@0 {\n"
+ "+\t\t\ti2c1: i2c at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1337,13 +1331,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@30000 {\t\t\t/* 0x48030000, ap 65 08.0 */\n"
+ " \t\ttarget-module at 30000 {\t\t\t/* 0x48030000, ap 65 08.0 */\n"
  "@@ -543,6 +785,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x30000 0x1000>;\n"
  "+\n"
- "+\t\t\tspi0: spi@0 {\n"
+ "+\t\t\tspi0: spi at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1353,13 +1347,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@34000 {\t\t\t/* 0x48034000, ap 80 56.0 */\n"
+ " \t\ttarget-module at 34000 {\t\t\t/* 0x48034000, ap 80 56.0 */\n"
  "@@ -576,6 +827,20 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x38000 0x2000>;\n"
  "+\n"
- "+\t\t\tmcasp0: mcasp@0 {\n"
+ "+\t\t\tmcasp0: mcasp at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n"
  "+\t\t\t\treg = <0x0 0x2000>,\n"
  "+\t\t\t\t      <0x46000000 0x400000>;\n"
@@ -1374,13 +1368,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@3c000 {\t\t\t/* 0x4803c000, ap 16 2a.0 */\n"
+ " \t\ttarget-module at 3c000 {\t\t\t/* 0x4803c000, ap 16 2a.0 */\n"
  "@@ -593,6 +858,20 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x3c000 0x2000>;\n"
  "+\n"
- "+\t\t\tmcasp1: mcasp@0 {\n"
+ "+\t\t\tmcasp1: mcasp at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n"
  "+\t\t\t\treg = <0x0 0x2000>,\n"
  "+\t\t\t\t      <0x46400000 0x400000>;\n"
@@ -1395,13 +1389,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@40000 {\t\t\t/* 0x48040000, ap 18 1e.0 */\n"
+ " \t\ttarget-module at 40000 {\t\t\t/* 0x48040000, ap 18 1e.0 */\n"
  "@@ -613,6 +892,14 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x40000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer2: timer@0  {\n"
+ "+\t\t\ttimer2: timer at 0  {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1410,13 +1404,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@42000 {\t\t\t/* 0x48042000, ap 20 24.0 */\n"
+ " \t\ttarget-module at 42000 {\t\t\t/* 0x48042000, ap 20 24.0 */\n"
  "@@ -633,6 +920,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x42000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer3: timer@0 {\n"
+ "+\t\t\ttimer3: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1424,13 +1418,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@44000 {\t\t\t/* 0x48044000, ap 22 26.0 */\n"
+ " \t\ttarget-module at 44000 {\t\t\t/* 0x48044000, ap 22 26.0 */\n"
  "@@ -653,6 +947,14 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x44000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer4: timer@0 {\n"
+ "+\t\t\ttimer4: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1439,13 +1433,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@46000 {\t\t\t/* 0x48046000, ap 24 28.0 */\n"
+ " \t\ttarget-module at 46000 {\t\t\t/* 0x48046000, ap 24 28.0 */\n"
  "@@ -673,6 +975,14 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x46000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer5: timer@0 {\n"
+ "+\t\t\ttimer5: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1454,13 +1448,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@48000 {\t\t\t/* 0x48048000, ap 26 1a.0 */\n"
+ " \t\ttarget-module at 48000 {\t\t\t/* 0x48048000, ap 26 1a.0 */\n"
  "@@ -693,6 +1003,14 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x48000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer6: timer@0 {\n"
+ "+\t\t\ttimer6: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1469,13 +1463,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@4a000 {\t\t\t/* 0x4804a000, ap 71 48.0 */\n"
+ " \t\ttarget-module at 4a000 {\t\t\t/* 0x4804a000, ap 71 48.0 */\n"
  "@@ -713,6 +1031,14 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x4a000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer7: timer@0 {\n"
+ "+\t\t\ttimer7: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1484,13 +1478,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@4c000 {\t\t\t/* 0x4804c000, ap 28 36.0 */\n"
+ " \t\ttarget-module at 4c000 {\t\t\t/* 0x4804c000, ap 28 36.0 */\n"
  "@@ -737,6 +1063,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x4c000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio1: gpio@0 {\n"
+ "+\t\t\tgpio1: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1502,13 +1496,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@60000 {\t\t\t/* 0x48060000, ap 30 14.0 */\n"
+ " \t\ttarget-module at 60000 {\t\t\t/* 0x48060000, ap 30 14.0 */\n"
  "@@ -760,6 +1097,18 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x60000 0x1000>;\n"
  "+\n"
- "+\t\t\tmmc1: mmc@0 {\n"
+ "+\t\t\tmmc1: mmc at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,omap4-hsmmc\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tti,dual-volt;\n"
@@ -1521,13 +1515,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@80000 {\t\t\t/* 0x48080000, ap 32 18.0 */\n"
+ " \t\ttarget-module at 80000 {\t\t\t/* 0x48080000, ap 32 18.0 */\n"
  "@@ -782,6 +1131,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x80000 0x10000>;\n"
  "+\n"
- "+\t\t\telm: elm@0 {\n"
+ "+\t\t\telm: elm at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am3352-elm\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1537,13 +1531,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@c8000 {\t\t\t/* 0x480c8000, ap 73 06.0 */\n"
+ " \t\ttarget-module at c8000 {\t\t\t/* 0x480c8000, ap 73 06.0 */\n"
  "@@ -800,6 +1158,20 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xc8000 0x1000>;\n"
  "+\n"
- "+\t\t\tmailbox: mailbox@0 {\n"
+ "+\t\t\tmailbox: mailbox at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,omap4-mailbox\";\n"
  "+\t\t\t\treg = <0x0 0x200>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1558,13 +1552,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@ca000 {\t\t\t/* 0x480ca000, ap 77 38.0 */\n"
+ " \t\ttarget-module at ca000 {\t\t\t/* 0x480ca000, ap 77 38.0 */\n"
  "@@ -823,6 +1195,12 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xca000 0x1000>;\n"
  "+\n"
- "+\t\t\thwspinlock: spinlock@0 {\n"
+ "+\t\t\thwspinlock: spinlock at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,omap4-hwspinlock\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\t#hwlock-cells = <1>;\n"
@@ -1577,7 +1571,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x9c000 0x1000>;\n"
  "+\n"
- "+\t\t\ti2c2: i2c@0 {\n"
+ "+\t\t\ti2c2: i2c at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-i2c\",\"ti,omap4-i2c\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1587,13 +1581,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a0000 {\t\t\t/* 0x481a0000, ap 67 2c.0 */\n"
+ " \t\ttarget-module at a0000 {\t\t\t/* 0x481a0000, ap 67 2c.0 */\n"
  "@@ -921,6 +1308,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa0000 0x1000>;\n"
  "+\n"
- "+\t\t\tspi1: spi@0 {\n"
+ "+\t\t\tspi1: spi at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1603,13 +1597,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a2000 {\t\t\t/* 0x481a2000, ap 69 2e.0 */\n"
+ " \t\ttarget-module at a2000 {\t\t\t/* 0x481a2000, ap 69 2e.0 */\n"
  "@@ -943,6 +1339,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa2000 0x1000>;\n"
  "+\n"
- "+\t\t\tspi2: spi@0 {\n"
+ "+\t\t\tspi2: spi at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1619,13 +1613,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a4000 {\t\t\t/* 0x481a4000, ap 92 62.0 */\n"
+ " \t\ttarget-module at a4000 {\t\t\t/* 0x481a4000, ap 92 62.0 */\n"
  "@@ -965,6 +1370,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa4000 0x1000>;\n"
  "+\n"
- "+\t\t\tspi3: spi@0 {\n"
+ "+\t\t\tspi3: spi at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1635,13 +1629,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a6000 {\t\t\t/* 0x481a6000, ap 40 16.0 */\n"
+ " \t\ttarget-module at a6000 {\t\t\t/* 0x481a6000, ap 40 16.0 */\n"
  "@@ -987,6 +1401,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa6000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart3: serial@0 {\n"
+ "+\t\t\tuart3: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1649,13 +1643,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a8000 {\t\t\t/* 0x481a8000, ap 42 20.0 */\n"
+ " \t\ttarget-module at a8000 {\t\t\t/* 0x481a8000, ap 42 20.0 */\n"
  "@@ -1009,6 +1430,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa8000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart4: serial@0 {\n"
+ "+\t\t\tuart4: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1663,13 +1657,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@aa000 {\t\t\t/* 0x481aa000, ap 44 12.0 */\n"
+ " \t\ttarget-module at aa000 {\t\t\t/* 0x481aa000, ap 44 12.0 */\n"
  "@@ -1031,6 +1459,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xaa000 0x1000>;\n"
  "+\n"
- "+\t\t\tuart5: serial@0 {\n"
+ "+\t\t\tuart5: serial at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1677,13 +1671,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@ac000 {\t\t\t/* 0x481ac000, ap 46 30.0 */\n"
+ " \t\ttarget-module at ac000 {\t\t\t/* 0x481ac000, ap 46 30.0 */\n"
  "@@ -1055,6 +1490,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xac000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio2: gpio@0 {\n"
+ "+\t\t\tgpio2: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1695,13 +1689,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@ae000 {\t\t\t/* 0x481ae000, ap 48 32.0 */\n"
+ " \t\ttarget-module at ae000 {\t\t\t/* 0x481ae000, ap 48 32.0 */\n"
  "@@ -1079,6 +1525,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xae000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio3: gpio@0 {\n"
+ "+\t\t\tgpio3: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1713,13 +1707,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@c1000 {\t\t\t/* 0x481c1000, ap 94 68.0 */\n"
+ " \t\ttarget-module at c1000 {\t\t\t/* 0x481c1000, ap 94 68.0 */\n"
  "@@ -1099,22 +1556,55 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xc1000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer8: timer@0 {\n"
+ "+\t\t\ttimer8: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -1727,7 +1721,7 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@cc000 {\t\t\t/* 0x481cc000, ap 50 46.0 */\n"
+ " \t\ttarget-module at cc000 {\t\t\t/* 0x481cc000, ap 50 46.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -1741,7 +1735,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xcc000 0x2000>;\n"
  "+\n"
- "+\t\t\tdcan0: can@0 {\n"
+ "+\t\t\tdcan0: can at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-d_can\", \"ti,am3352-d_can\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tsyscon-raminit = <&scm_conf 0x644 0>;\n"
@@ -1750,7 +1744,7 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@d0000 {\t\t\t/* 0x481d0000, ap 52 3a.0 */\n"
+ " \t\ttarget-module at d0000 {\t\t\t/* 0x481d0000, ap 52 3a.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -1764,7 +1758,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xd0000 0x2000>;\n"
  "+\n"
- "+\t\t\tdcan1: can@0 {\n"
+ "+\t\t\tdcan1: can at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-d_can\", \"ti,am3352-d_can\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tsyscon-raminit = <&scm_conf 0x644 1>;\n"
@@ -1773,13 +1767,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@d8000 {\t\t\t/* 0x481d8000, ap 54 5e.0 */\n"
+ " \t\ttarget-module at d8000 {\t\t\t/* 0x481d8000, ap 54 5e.0 */\n"
  "@@ -1138,6 +1628,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xd8000 0x1000>;\n"
  "+\n"
- "+\t\t\tmmc2: mmc@0 {\n"
+ "+\t\t\tmmc2: mmc at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,omap4-hsmmc\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tti,needs-special-reset;\n"
@@ -1797,7 +1791,7 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x0 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss0: epwmss@0 {\n"
+ "+\t\t\tepwmss0: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1805,7 +1799,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tecap0: ecap@100 {\n"
+ "+\t\t\t\tecap0: ecap at 100 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -1816,7 +1810,7 @@
  "+\t\t\t\t\tstatus = \"disabled\";\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tehrpwm0: pwm@200 {\n"
+ "+\t\t\t\tehrpwm0: pwm at 200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1829,13 +1823,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@2000 {\t\t\t/* 0x48302000, ap 58 4a.0 */\n"
+ " \t\ttarget-module at 2000 {\t\t\t/* 0x48302000, ap 58 4a.0 */\n"
  "@@ -1248,6 +1780,37 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x2000 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss1: epwmss@0 {\n"
+ "+\t\t\tepwmss1: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1843,7 +1837,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tecap1: ecap@100 {\n"
+ "+\t\t\t\tecap1: ecap at 100 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -1854,7 +1848,7 @@
  "+\t\t\t\t\tstatus = \"disabled\";\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tehrpwm1: pwm@200 {\n"
+ "+\t\t\t\tehrpwm1: pwm at 200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1867,13 +1861,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@4000 {\t\t\t/* 0x48304000, ap 60 44.0 */\n"
+ " \t\ttarget-module at 4000 {\t\t\t/* 0x48304000, ap 60 44.0 */\n"
  "@@ -1270,6 +1833,37 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x4000 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss2: epwmss@0 {\n"
+ "+\t\t\tepwmss2: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1881,7 +1875,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tecap2: ecap@100 {\n"
+ "+\t\t\t\tecap2: ecap at 100 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ecap\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ecap\";\n"
@@ -1892,7 +1886,7 @@
  "+\t\t\t\t\tstatus = \"disabled\";\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tehrpwm2: pwm@200 {\n"
+ "+\t\t\t\tehrpwm2: pwm at 200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1905,13 +1899,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@6000 {\t\t\t/* 0x48306000, ap 96 58.0 */\n"
+ " \t\ttarget-module at 6000 {\t\t\t/* 0x48306000, ap 96 58.0 */\n"
  "@@ -1292,6 +1886,26 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x6000 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss3: epwmss@0 {\n"
+ "+\t\t\tepwmss3: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1919,7 +1913,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tehrpwm3: pwm@200 {\n"
+ "+\t\t\t\tehrpwm3: pwm at 200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1932,13 +1926,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@8000 {\t\t\t/* 0x48308000, ap 98 54.0 */\n"
+ " \t\ttarget-module at 8000 {\t\t\t/* 0x48308000, ap 98 54.0 */\n"
  "@@ -1314,6 +1928,26 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x8000 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss4: epwmss@0 {\n"
+ "+\t\t\tepwmss4: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1946,7 +1940,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tehrpwm4: pwm@48308200 {\n"
+ "+\t\t\t\tehrpwm4: pwm at 48308200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1959,13 +1953,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a000 {\t\t\t/* 0x4830a000, ap 100 60.0 */\n"
+ " \t\ttarget-module at a000 {\t\t\t/* 0x4830a000, ap 100 60.0 */\n"
  "@@ -1336,6 +1970,26 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa000 0x1000>;\n"
  "+\n"
- "+\t\t\tepwmss5: epwmss@0 {\n"
+ "+\t\t\tepwmss5: epwmss at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-pwmss\",\"ti,am33xx-pwmss\";\n"
  "+\t\t\t\treg = <0x0 0x10>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1973,7 +1967,7 @@
  "+\t\t\t\tranges = <0 0 0x1000>;\n"
  "+\t\t\t\tstatus = \"disabled\";\n"
  "+\n"
- "+\t\t\t\tehrpwm5: pwm@200 {\n"
+ "+\t\t\t\tehrpwm5: pwm at 200 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am4372-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am3352-ehrpwm\",\n"
  "+\t\t\t\t\t\t     \"ti,am33xx-ehrpwm\";\n"
@@ -1986,26 +1980,26 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@10000 {\t\t\t/* 0x48310000, ap 64 4e.1 */\n"
+ " \t\ttarget-module at 10000 {\t\t\t/* 0x48310000, ap 64 4e.1 */\n"
  "@@ -1353,6 +2007,12 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x10000 0x2000>;\n"
  "+\n"
- "+\t\t\trng: rng@0 {\n"
+ "+\t\t\trng: rng at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,omap4-rng\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;\n"
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@13000 {\t\t\t/* 0x48313000, ap 90 50.0 */\n"
+ " \t\ttarget-module at 13000 {\t\t\t/* 0x48313000, ap 90 50.0 */\n"
  "@@ -1393,6 +2053,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x20000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio4: gpio@0 {\n"
+ "+\t\t\tgpio4: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2017,13 +2011,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@22000 {\t\t\t/* 0x48322000, ap 116 64.0 */\n"
+ " \t\ttarget-module at 22000 {\t\t\t/* 0x48322000, ap 116 64.0 */\n"
  "@@ -1417,6 +2088,17 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x22000 0x1000>;\n"
  "+\n"
- "+\t\t\tgpio5: gpio@0 {\n"
+ "+\t\t\tgpio5: gpio at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-gpio\",\"ti,omap4-gpio\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2035,13 +2029,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@26000 {\t\t\t/* 0x48326000, ap 86 66.0 */\n"
+ " \t\ttarget-module at 26000 {\t\t\t/* 0x48326000, ap 86 66.0 */\n"
  "@@ -1437,6 +2119,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x26000 0x1000>;\n"
  "+\n"
- "+\t\t\tvpfe0: vpfe@0 {\n"
+ "+\t\t\tvpfe0: vpfe at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-vpfe\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2049,13 +2043,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@28000 {\t\t\t/* 0x48328000, ap 75 0e.0 */\n"
+ " \t\ttarget-module at 28000 {\t\t\t/* 0x48328000, ap 75 0e.0 */\n"
  "@@ -1457,6 +2146,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x28000 0x1000>;\n"
  "+\n"
- "+\t\t\tvpfe1: vpfe@0 {\n"
+ "+\t\t\tvpfe1: vpfe at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-vpfe\";\n"
  "+\t\t\t\treg = <0x0 0x2000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2063,13 +2057,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@2a000 {\t\t\t/* 0x4832a000, ap 88 3c.0 */\n"
+ " \t\ttarget-module at 2a000 {\t\t\t/* 0x4832a000, ap 88 3c.0 */\n"
  "@@ -1499,6 +2195,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x3d000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer9: timer@0 {\n"
+ "+\t\t\ttimer9: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2077,13 +2071,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@3f000 {\t\t\t/* 0x4833f000, ap 104 5c.0 */\n"
+ " \t\ttarget-module at 3f000 {\t\t\t/* 0x4833f000, ap 104 5c.0 */\n"
  "@@ -1519,6 +2222,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x3f000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer10: timer@0 {\n"
+ "+\t\t\ttimer10: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2091,13 +2085,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@41000 {\t\t\t/* 0x48341000, ap 106 76.0 */\n"
+ " \t\ttarget-module at 41000 {\t\t\t/* 0x48341000, ap 106 76.0 */\n"
  "@@ -1539,6 +2249,13 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x41000 0x1000>;\n"
  "+\n"
- "+\t\t\ttimer11: timer@0 {\n"
+ "+\t\t\ttimer11: timer at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2105,13 +2099,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@45000 {\t\t\t/* 0x48345000, ap 108 6a.0 */\n"
+ " \t\ttarget-module at 45000 {\t\t\t/* 0x48345000, ap 108 6a.0 */\n"
  "@@ -1561,6 +2278,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x45000 0x1000>;\n"
  "+\n"
- "+\t\t\tspi4: spi@0 {\n"
+ "+\t\t\tspi4: spi at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-mcspi\",\"ti,omap4-mcspi\";\n"
  "+\t\t\t\treg = <0x0 0x400>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2121,13 +2115,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@47000 {\t\t\t/* 0x48347000, ap 110 70.0 */\n"
+ " \t\ttarget-module at 47000 {\t\t\t/* 0x48347000, ap 110 70.0 */\n"
  "@@ -1578,6 +2304,15 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x47000 0x1000>;\n"
  "+\n"
- "+\t\t\thdq: hdq@0 {\n"
+ "+\t\t\thdq: hdq at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am4372-hdq\";\n"
  "+\t\t\t\treg = <0x0 0x1000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2137,13 +2131,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@4c000 {\t\t\t/* 0x4834c000, ap 114 72.0 */\n"
+ " \t\ttarget-module at 4c000 {\t\t\t/* 0x4834c000, ap 114 72.0 */\n"
  "@@ -1609,14 +2344,65 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0x80000 0x20000>;\n"
  "+\n"
- "+\t\t\tdwc3_1: omap_dwc3@0 {\n"
+ "+\t\t\tdwc3_1: omap_dwc3 at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-dwc3\";\n"
  "+\t\t\t\treg = <0x0 0x10000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2152,7 +2146,7 @@
  "+\t\t\t\tutmi-mode = <1>;\n"
  "+\t\t\t\tranges = <0 0 0x20000>;\n"
  "+\n"
- "+\t\t\t\tusb1: usb@10000 {\n"
+ "+\t\t\t\tusb1: usb at 10000 {\n"
  "+\t\t\t\t\tcompatible = \"synopsys,dwc3\";\n"
  "+\t\t\t\t\treg = <0x10000 0x10000>;\n"
  "+\t\t\t\t\tinterrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,\n"
@@ -2172,7 +2166,7 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@a8000 {\t\t\t/* 0x483a8000, ap 125 6c.0 */\n"
+ " \t\ttarget-module at a8000 {\t\t\t/* 0x483a8000, ap 125 6c.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -2186,13 +2180,13 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xa8000 0x8000>;\n"
  "+\n"
- "+\t\t\tocp2scp0: ocp2scp@0 {\n"
+ "+\t\t\tocp2scp0: ocp2scp at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-ocp2scp\", \"ti,omap-ocp2scp\";\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\tranges = <0 0 0x8000>;\n"
  "+\n"
- "+\t\t\t\tusb2_phy1: phy@8000 {\n"
+ "+\t\t\t\tusb2_phy1: phy at 8000 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am437x-usb2\";\n"
  "+\t\t\t\t\treg = <0x0 0x8000>;\n"
  "+\t\t\t\t\tsyscon-phy-power = <&scm_conf 0x620>;\n"
@@ -2205,13 +2199,13 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@c0000 {\t\t\t/* 0x483c0000, ap 127 7a.0 */\n"
+ " \t\ttarget-module at c0000 {\t\t\t/* 0x483c0000, ap 127 7a.0 */\n"
  "@@ -1640,14 +2426,65 @@\n"
  " \t\t\t#address-cells = <1>;\n"
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xc0000 0x20000>;\n"
  "+\n"
- "+\t\t\tdwc3_2: omap_dwc3@0 {\n"
+ "+\t\t\tdwc3_2: omap_dwc3 at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-dwc3\";\n"
  "+\t\t\t\treg = <0x0 0x10000>;\n"
  "+\t\t\t\tinterrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -2220,7 +2214,7 @@
  "+\t\t\t\tutmi-mode = <1>;\n"
  "+\t\t\t\tranges = <0 0 0x20000>;\n"
  "+\n"
- "+\t\t\t\tusb2: usb@10000 {\n"
+ "+\t\t\t\tusb2: usb at 10000 {\n"
  "+\t\t\t\t\tcompatible = \"synopsys,dwc3\";\n"
  "+\t\t\t\t\treg = <0x10000 0x10000>;\n"
  "+\t\t\t\t\tinterrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,\n"
@@ -2240,7 +2234,7 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@e8000 {\t\t\t/* 0x483e8000, ap 129 78.0 */\n"
+ " \t\ttarget-module at e8000 {\t\t\t/* 0x483e8000, ap 129 78.0 */\n"
  "-\t\t\tcompatible = \"ti,sysc\";\n"
  "-\t\t\tstatus = \"disabled\";\n"
  "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n"
@@ -2254,13 +2248,13 @@
  " \t\t\t#size-cells = <1>;\n"
  " \t\t\tranges = <0x0 0xe8000 0x8000>;\n"
  "+\n"
- "+\t\t\tocp2scp1: ocp2scp@0 {\n"
+ "+\t\t\tocp2scp1: ocp2scp at 0 {\n"
  "+\t\t\t\tcompatible = \"ti,am437x-ocp2scp\", \"ti,omap-ocp2scp\";\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\tranges = <0 0 0x8000>;\n"
  "+\n"
- "+\t\t\t\tusb2_phy2: phy@8000 {\n"
+ "+\t\t\t\tusb2_phy2: phy at 8000 {\n"
  "+\t\t\t\t\tcompatible = \"ti,am437x-usb2\";\n"
  "+\t\t\t\t\treg = <0x0 0x8000>;\n"
  "+\t\t\t\t\tsyscon-phy-power = <&scm_conf 0x628>;\n"
@@ -2273,8 +2267,8 @@
  "+\t\t\t};\n"
  " \t\t};\n"
  " \n"
- " \t\ttarget-module@f2000 {\t\t\t/* 0x483f2000, ap 112 5a.0 */\n"
+ " \t\ttarget-module at f2000 {\t\t\t/* 0x483f2000, ap 112 5a.0 */\n"
  "-- \n"
  2.19.0
 
-c9185b62a4b3cdad6d2f154a66e2393f7a404fcea5a61b155098dcfe978d8544
+23ffa68a32acfc6d0d979b5221540cd87ef3a044118f25da536f3f5c0ed80d71

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.