diff for duplicates of <20180925000545.22931-5-tony@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 3ef8f49..ef6011c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,8 +30,8 @@ diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts pinctrl-1 = <&cpsw_sleep>; status = "okay"; slaves = <1>; -- cpsw_emac0: slave@4a100200 { -+ cpsw_emac0: slave@200 { +- cpsw_emac0: slave at 4a100200 { ++ cpsw_emac0: slave at 200 { phy-mode = "mii"; phy-handle = <ðernetphy0>; }; @@ -41,7 +41,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi @@ -31,11 +31,13 @@ <0x00082000 0x00182000 0x001000>; /* ap 7 */ - target-module@0 { /* 0x44d00000, ap 4 28.0 */ + target-module at 0 { /* 0x44d00000, ap 4 28.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4", "ti,sysc"; @@ -53,11 +53,11 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; }; - target-module@80000 { /* 0x44d80000, ap 6 10.0 */ + target-module at 80000 { /* 0x44d80000, ap 6 10.0 */ @@ -85,11 +87,28 @@ <0x00080000 0x00280000 0x001000>; /* ap 39 */ - target-module@0 { /* 0x44e00000, ap 8 58.0 */ + target-module at 0 { /* 0x44e00000, ap 8 58.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4", "ti,sysc"; @@ -67,7 +67,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0x0 0x2000>; + -+ prcm: prcm@0 { ++ prcm: prcm at 0 { + compatible = "ti,am3-prcm", "simple-bus"; + reg = <0 0x2000>; + #address-cells = <1>; @@ -84,13 +84,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@3000 { /* 0x44e03000, ap 10 0a.0 */ + target-module at 3000 { /* 0x44e03000, ap 10 0a.0 */ @@ -130,6 +149,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x7000 0x1000>; + -+ gpio0: gpio@0 { ++ gpio0: gpio at 0 { + compatible = "ti,omap4-gpio"; + gpio-controller; + #gpio-cells = <2>; @@ -101,13 +101,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@9000 { /* 0x44e09000, ap 16 04.0 */ + target-module at 9000 { /* 0x44e09000, ap 16 04.0 */ @@ -152,6 +181,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x9000 0x1000>; + -+ uart0: serial@0 { ++ uart0: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -118,13 +118,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@b000 { /* 0x44e0b000, ap 18 48.0 */ + target-module at b000 { /* 0x44e0b000, ap 18 48.0 */ @@ -176,6 +215,15 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xb000 0x1000>; + -+ i2c0: i2c@0 { ++ i2c0: i2c at 0 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; @@ -134,13 +134,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@d000 { /* 0x44e0d000, ap 20 38.0 */ + target-module at d000 { /* 0x44e0d000, ap 20 38.0 */ @@ -195,15 +243,90 @@ #size-cells = <1>; ranges = <0x00000000 0x0000d000 0x00001000>, <0x00001000 0x0000e000 0x00001000>; + -+ tscadc: tscadc@0 { ++ tscadc: tscadc at 0 { + compatible = "ti,am3359-tscadc"; + reg = <0x0 0x1000>; + interrupts = <16>; @@ -158,7 +158,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-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"; @@ -169,7 +169,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi ranges = <0x00000000 0x00010000 0x00010000>, <0x00010000 0x00020000 0x00010000>; + -+ scm: scm@0 { ++ scm: scm at 0 { + compatible = "ti,am3-scm", "simple-bus"; + reg = <0x0 0x2000>; + #address-cells = <1>; @@ -177,13 +177,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + #pinctrl-cells = <1>; + ranges = <0 0 0x2000>; + -+ phy_sel: cpsw-phy-sel@650 { ++ phy_sel: cpsw-phy-sel at 650 { + compatible = "ti,am3352-cpsw-phy-sel"; + reg= <0x650 0x4>; + reg-names = "gmii-sel"; + }; + -+ am33xx_pinmux: pinmux@800 { ++ am33xx_pinmux: pinmux at 800 { + compatible = "pinctrl-single"; + reg = <0x800 0x238>; + #address-cells = <1>; @@ -193,7 +193,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + pinctrl-single,function-mask = <0x7f>; + }; + -+ scm_conf: scm_conf@0 { ++ scm_conf: scm_conf at 0 { + compatible = "syscon", "simple-bus"; + reg = <0x0 0x800>; + #address-cells = <1>; @@ -206,7 +206,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; + }; + -+ wkup_m3_ipc: wkup_m3_ipc@1324 { ++ wkup_m3_ipc: wkup_m3_ipc at 1324 { + compatible = "ti,am3352-wkup-m3-ipc"; + reg = <0x1324 0x24>; + interrupts = <78>; @@ -214,7 +214,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-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>; @@ -227,13 +227,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@31000 { /* 0x44e31000, ap 25 40.0 */ + target-module at 31000 { /* 0x44e31000, ap 25 40.0 */ @@ -226,6 +349,15 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x31000 0x1000>; + -+ timer1: timer@0 { ++ timer1: timer at 0 { + compatible = "ti,am335x-timer-1ms"; + reg = <0x0 0x400>; + interrupts = <67>; @@ -243,26 +243,26 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@33000 { /* 0x44e33000, ap 27 18.0 */ + target-module at 33000 { /* 0x44e33000, ap 27 18.0 */ @@ -256,6 +388,12 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x35000 0x1000>; + -+ wdt2: wdt@0 { ++ wdt2: wdt at 0 { + compatible = "ti,omap3-wdt"; + reg = <0x0 0x1000>; + interrupts = <91>; + }; }; - target-module@37000 { /* 0x44e37000, ap 31 08.0 */ + target-module at 37000 { /* 0x44e37000, ap 31 08.0 */ @@ -290,6 +428,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x3e000 0x1000>; + -+ rtc: rtc@0 { ++ rtc: rtc at 0 { + compatible = "ti,am3352-rtc", "ti,da830-rtc"; + reg = <0x0 0x1000>; + interrupts = <75 @@ -270,11 +270,11 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@40000 { /* 0x44e40000, ap 38 68.0 */ + target-module at 40000 { /* 0x44e40000, ap 38 68.0 */ @@ -529,11 +674,72 @@ <0x00380000 0x00380000 0x001000>; /* ap 10 */ - target-module@100000 { /* 0x4a100000, ap 3 08.0 */ + target-module at 100000 { /* 0x4a100000, ap 3 08.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4-simple", "ti,sysc"; @@ -295,7 +295,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0x100000 0x8000>; + -+ mac: ethernet@0 { ++ mac: ethernet at 0 { + compatible = "ti,am335x-cpsw","ti,cpsw"; + clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>; + clock-names = "fck", "cpts"; @@ -323,7 +323,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + cpsw-phy-sel = <&phy_sel>; + status = "disabled"; + -+ davinci_mdio: mdio@1000 { ++ davinci_mdio: mdio at 1000 { + compatible = "ti,cpsw-mdio","ti,davinci_mdio"; + #address-cells = <1>; + #size-cells = <0>; @@ -333,25 +333,25 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-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@180000 { /* 0x4a180000, ap 5 10.0 */ + target-module at 180000 { /* 0x4a180000, ap 5 10.0 */ @@ -721,6 +927,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x22000 0x1000>; + -+ uart1: serial@0 { ++ uart1: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -362,13 +362,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@24000 { /* 0x48024000, ap 12 14.0 */ + target-module at 24000 { /* 0x48024000, ap 12 14.0 */ @@ -743,6 +959,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x24000 0x1000>; + -+ uart2: serial@0 { ++ uart2: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -379,13 +379,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@2a000 { /* 0x4802a000, ap 14 2a.0 */ + target-module at 2a000 { /* 0x4802a000, ap 14 2a.0 */ @@ -767,6 +993,15 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x2a000 0x1000>; + -+ i2c1: i2c@0 { ++ i2c1: i2c at 0 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; @@ -395,13 +395,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@30000 { /* 0x48030000, ap 77 08.0 */ + target-module at 30000 { /* 0x48030000, ap 77 08.0 */ @@ -789,6 +1024,21 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x30000 0x1000>; + -+ spi0: spi@0 { ++ spi0: spi at 0 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; @@ -417,13 +417,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@38000 { /* 0x48038000, ap 16 02.0 */ + target-module at 38000 { /* 0x48038000, ap 16 02.0 */ @@ -806,6 +1056,19 @@ #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>; @@ -437,13 +437,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@3c000 { /* 0x4803c000, ap 20 32.0 */ + target-module at 3c000 { /* 0x4803c000, ap 20 32.0 */ @@ -823,6 +1086,19 @@ #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>; @@ -457,13 +457,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@40000 { /* 0x48040000, ap 22 1e.0 */ + target-module at 40000 { /* 0x48040000, ap 22 1e.0 */ @@ -843,6 +1119,14 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x40000 0x1000>; + -+ timer2: timer@0 { ++ timer2: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <68>; @@ -472,26 +472,26 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@42000 { /* 0x48042000, ap 24 1c.0 */ + target-module at 42000 { /* 0x48042000, ap 24 1c.0 */ @@ -863,6 +1147,12 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x42000 0x1000>; + -+ timer3: timer@0 { ++ timer3: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <69>; + }; }; - target-module@44000 { /* 0x48044000, ap 26 26.0 */ + target-module at 44000 { /* 0x48044000, ap 26 26.0 */ @@ -883,6 +1173,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x44000 0x1000>; + -+ timer4: timer@0 { ++ timer4: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <92>; @@ -499,13 +499,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@46000 { /* 0x48046000, ap 28 28.0 */ + target-module at 46000 { /* 0x48046000, ap 28 28.0 */ @@ -903,6 +1200,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x46000 0x1000>; + -+ timer5: timer@0 { ++ timer5: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <93>; @@ -513,13 +513,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@48000 { /* 0x48048000, ap 30 22.0 */ + target-module at 48000 { /* 0x48048000, ap 30 22.0 */ @@ -923,6 +1227,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x48000 0x1000>; + -+ timer6: timer@0 { ++ timer6: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <94>; @@ -527,13 +527,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@4a000 { /* 0x4804a000, ap 85 60.0 */ + target-module at 4a000 { /* 0x4804a000, ap 85 60.0 */ @@ -943,6 +1254,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x4a000 0x1000>; + -+ timer7: timer@0 { ++ timer7: timer at 0 { + compatible = "ti,am335x-timer"; + reg = <0x0 0x400>; + interrupts = <95>; @@ -541,13 +541,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@4c000 { /* 0x4804c000, ap 32 36.0 */ + target-module at 4c000 { /* 0x4804c000, ap 32 36.0 */ @@ -967,6 +1285,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x4c000 0x1000>; + -+ gpio1: gpio@0 { ++ gpio1: gpio at 0 { + compatible = "ti,omap4-gpio"; + gpio-controller; + #gpio-cells = <2>; @@ -558,13 +558,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@50000 { /* 0x48050000, ap 34 2c.0 */ + target-module at 50000 { /* 0x48050000, ap 34 2c.0 */ @@ -998,6 +1326,19 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x60000 0x1000>; + -+ mmc1: mmc@0 { ++ mmc1: mmc at 0 { + compatible = "ti,omap4-hsmmc"; + ti,dual-volt; + ti,needs-special-reset; @@ -578,13 +578,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@80000 { /* 0x48080000, ap 38 18.0 */ + target-module at 80000 { /* 0x48080000, ap 38 18.0 */ @@ -1020,6 +1361,13 @@ #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 = <4>; @@ -592,13 +592,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@a0000 { /* 0x480a0000, ap 40 5e.0 */ + target-module at a0000 { /* 0x480a0000, ap 40 5e.0 */ @@ -1046,6 +1394,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 = <77>; @@ -613,26 +613,26 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@ca000 { /* 0x480ca000, ap 91 40.0 */ + target-module at ca000 { /* 0x480ca000, ap 91 40.0 */ @@ -1069,6 +1431,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>; + }; }; - target-module@cc000 { /* 0x480cc000, ap 89 0e.0 */ + target-module at cc000 { /* 0x480cc000, ap 89 0e.0 */ @@ -1153,6 +1521,15 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x9c000 0x1000>; + -+ i2c2: i2c@0 { ++ i2c2: i2c at 0 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; @@ -642,13 +642,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@a0000 { /* 0x481a0000, ap 79 24.0 */ + target-module at a0000 { /* 0x481a0000, ap 79 24.0 */ @@ -1175,6 +1552,21 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xa0000 0x1000>; + -+ spi1: spi@0 { ++ spi1: spi at 0 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; @@ -664,13 +664,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@a2000 { /* 0x481a2000, ap 81 2e.0 */ + target-module at a2000 { /* 0x481a2000, ap 81 2e.0 */ @@ -1213,6 +1605,14 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xa6000 0x1000>; + -+ uart3: serial@0 { ++ uart3: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -679,13 +679,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@a8000 { /* 0x481a8000, ap 50 20.0 */ + target-module at a8000 { /* 0x481a8000, ap 50 20.0 */ @@ -1235,6 +1635,14 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xa8000 0x1000>; + -+ uart4: serial@0 { ++ uart4: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -694,13 +694,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@aa000 { /* 0x481aa000, ap 52 1a.0 */ + target-module at aa000 { /* 0x481aa000, ap 52 1a.0 */ @@ -1257,6 +1665,14 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xaa000 0x1000>; + -+ uart5: serial@0 { ++ uart5: serial at 0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; @@ -709,13 +709,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@ac000 { /* 0x481ac000, ap 54 38.0 */ + target-module at ac000 { /* 0x481ac000, ap 54 38.0 */ @@ -1281,6 +1697,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xac000 0x1000>; + -+ gpio2: gpio@0 { ++ gpio2: gpio at 0 { + compatible = "ti,omap4-gpio"; + gpio-controller; + #gpio-cells = <2>; @@ -726,13 +726,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ + target-module at ae000 { /* 0x481ae000, ap 56 3a.0 */ @@ -1305,6 +1731,16 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xae000 0x1000>; + -+ gpio3: gpio@0 { ++ gpio3: gpio at 0 { + compatible = "ti,omap4-gpio"; + gpio-controller; + #gpio-cells = <2>; @@ -743,11 +743,11 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@b0000 { /* 0x481b0000, ap 58 50.0 */ + target-module at b0000 { /* 0x481b0000, ap 58 50.0 */ @@ -1316,19 +1752,49 @@ }; - target-module@cc000 { /* 0x481cc000, ap 60 46.0 */ + target-module at cc000 { /* 0x481cc000, ap 60 46.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4", "ti,sysc"; @@ -761,7 +761,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0xcc000 0x2000>; + -+ dcan0: can@0 { ++ dcan0: can at 0 { + compatible = "ti,am3352-d_can"; + reg = <0x0 0x2000>; + clocks = <&dcan0_fck>; @@ -772,7 +772,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@d0000 { /* 0x481d0000, ap 62 42.0 */ + target-module at d0000 { /* 0x481d0000, ap 62 42.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4", "ti,sysc"; @@ -786,7 +786,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0xd0000 0x2000>; + -+ dcan1: can@0 { ++ dcan1: can at 0 { + compatible = "ti,am3352-d_can"; + reg = <0x0 0x2000>; + clocks = <&dcan1_fck>; @@ -797,13 +797,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@d8000 { /* 0x481d8000, ap 64 66.0 */ + target-module at d8000 { /* 0x481d8000, ap 64 66.0 */ @@ -1352,6 +1818,17 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xd8000 0x1000>; + -+ mmc2: mmc@0 { ++ mmc2: mmc at 0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + dmas = <&edma 2 0 @@ -821,7 +821,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0x0 0x1000>; + -+ epwmss0: epwmss@0 { ++ epwmss0: epwmss at 0 { + compatible = "ti,am33xx-pwmss"; + reg = <0x0 0x10>; + #address-cells = <1>; @@ -831,7 +831,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + 0x48300180 0x48300180 0x80 /* EQEP */ + 0x48300200 0x48300200 0x80>; /* EHRPWM */ + -+ ecap0: ecap@48300100 { ++ ecap0: ecap at 48300100 { + compatible = "ti,am3352-ecap", + "ti,am33xx-ecap"; + #pwm-cells = <3>; @@ -843,7 +843,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; + }; + -+ ehrpwm0: pwm@48300200 { ++ ehrpwm0: pwm at 48300200 { + compatible = "ti,am3352-ehrpwm", + "ti,am33xx-ehrpwm"; + #pwm-cells = <3>; @@ -855,13 +855,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@2000 { /* 0x48302000, ap 68 52.0 */ + target-module at 2000 { /* 0x48302000, ap 68 52.0 */ @@ -1431,6 +1941,39 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x2000 0x1000>; + -+ epwmss1: epwmss@0 { ++ epwmss1: epwmss at 0 { + compatible = "ti,am33xx-pwmss"; + reg = <0x0 0x10>; + #address-cells = <1>; @@ -871,7 +871,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + 0x48302180 0x48302180 0x80 /* EQEP */ + 0x48302200 0x48302200 0x80>; /* EHRPWM */ + -+ ecap1: ecap@48302100 { ++ ecap1: ecap at 48302100 { + compatible = "ti,am3352-ecap", + "ti,am33xx-ecap"; + #pwm-cells = <3>; @@ -883,7 +883,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; + }; + -+ ehrpwm1: pwm@48302200 { ++ ehrpwm1: pwm at 48302200 { + compatible = "ti,am3352-ehrpwm", + "ti,am33xx-ehrpwm"; + #pwm-cells = <3>; @@ -895,13 +895,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@4000 { /* 0x48304000, ap 70 44.0 */ + target-module at 4000 { /* 0x48304000, ap 70 44.0 */ @@ -1453,6 +1996,39 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x4000 0x1000>; + -+ epwmss2: epwmss@0 { ++ epwmss2: epwmss at 0 { + compatible = "ti,am33xx-pwmss"; + reg = <0x0 0x10>; + #address-cells = <1>; @@ -911,7 +911,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + 0x48304180 0x48304180 0x80 /* EQEP */ + 0x48304200 0x48304200 0x80>; /* EHRPWM */ + -+ ecap2: ecap@48304100 { ++ ecap2: ecap at 48304100 { + compatible = "ti,am3352-ecap", + "ti,am33xx-ecap"; + #pwm-cells = <3>; @@ -923,7 +923,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; + }; + -+ ehrpwm2: pwm@48304200 { ++ ehrpwm2: pwm at 48304200 { + compatible = "ti,am3352-ehrpwm", + "ti,am33xx-ehrpwm"; + #pwm-cells = <3>; @@ -935,13 +935,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@e000 { /* 0x4830e000, ap 72 4a.0 */ + target-module at e000 { /* 0x4830e000, ap 72 4a.0 */ @@ -1471,6 +2047,13 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xe000 0x1000>; + -+ lcdc: lcdc@0 { ++ lcdc: lcdc at 0 { + compatible = "ti,am33xx-tilcdc"; + reg = <0x0 0x1000>; + interrupts = <36>; @@ -949,20 +949,20 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + }; }; - target-module@10000 { /* 0x48310000, ap 76 4e.1 */ + target-module at 10000 { /* 0x48310000, ap 76 4e.1 */ @@ -1488,6 +2071,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 = <111>; + }; }; - target-module@13000 { /* 0x48313000, ap 97 62.0 */ + target-module at 13000 { /* 0x48313000, ap 97 62.0 */ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -978,14 +978,14 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi ranges; ti,hwmods = "l3_main"; -- l4_wkup: l4_wkup@44c00000 { +- l4_wkup: l4_wkup at 44c00000 { - compatible = "ti,am3-l4-wkup", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x44c00000 0x280000>; - -+ l4_wkup: interconnect@44c00000 { - wkup_m3: wkup_m3@100000 { ++ l4_wkup: interconnect at 44c00000 { + wkup_m3: wkup_m3 at 100000 { compatible = "ti,am3352-wkup-m3"; reg = <0x100000 0x4000>, - <0x180000 0x2000>; @@ -995,7 +995,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi ti,pm-firmware = "am335x-pm-firmware.elf"; }; - -- prcm: prcm@200000 { +- prcm: prcm at 200000 { - compatible = "ti,am3-prcm", "simple-bus"; - reg = <0x200000 0x4000>; - #address-cells = <1>; @@ -1011,7 +1011,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- scm: scm@210000 { +- scm: scm at 210000 { - compatible = "ti,am3-scm", "simple-bus"; - reg = <0x210000 0x2000>; - #address-cells = <1>; @@ -1019,7 +1019,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - #pinctrl-cells = <1>; - ranges = <0 0x210000 0x2000>; - -- am33xx_pinmux: pinmux@800 { +- am33xx_pinmux: pinmux at 800 { - compatible = "pinctrl-single"; - reg = <0x800 0x238>; - #address-cells = <1>; @@ -1029,7 +1029,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - pinctrl-single,function-mask = <0x7f>; - }; - -- scm_conf: scm_conf@0 { +- scm_conf: scm_conf at 0 { - compatible = "syscon", "simple-bus"; - reg = <0x0 0x800>; - #address-cells = <1>; @@ -1042,7 +1042,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- wkup_m3_ipc: wkup_m3_ipc@1324 { +- wkup_m3_ipc: wkup_m3_ipc at 1324 { - compatible = "ti,am3352-wkup-m3-ipc"; - reg = <0x1324 0x24>; - interrupts = <78>; @@ -1050,7 +1050,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.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>; @@ -1062,21 +1062,21 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; + }; -+ l4_per: interconnect@48000000 { ++ l4_per: interconnect at 48000000 { + }; -+ l4_fw: interconnect@47c00000 { ++ l4_fw: interconnect at 47c00000 { + }; -+ l4_fast: interconnect@4a000000 { ++ l4_fast: interconnect at 4a000000 { + }; -+ l4_mpuss: interconnect@4b140000 { ++ l4_mpuss: interconnect at 4b140000 { }; - intc: interrupt-controller@48200000 { + intc: interrupt-controller at 48200000 { @@ -297,166 +234,6 @@ interrupt-names = "edma3_tcerrint"; }; -- gpio0: gpio@44e07000 { +- gpio0: gpio at 44e07000 { - compatible = "ti,omap4-gpio"; - ti,hwmods = "gpio1"; - gpio-controller; @@ -1087,7 +1087,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - interrupts = <96>; - }; - -- gpio1: gpio@4804c000 { +- gpio1: gpio at 4804c000 { - compatible = "ti,omap4-gpio"; - ti,hwmods = "gpio2"; - gpio-controller; @@ -1098,7 +1098,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - interrupts = <98>; - }; - -- gpio2: gpio@481ac000 { +- gpio2: gpio at 481ac000 { - compatible = "ti,omap4-gpio"; - ti,hwmods = "gpio3"; - gpio-controller; @@ -1109,7 +1109,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - interrupts = <32>; - }; - -- gpio3: gpio@481ae000 { +- gpio3: gpio at 481ae000 { - compatible = "ti,omap4-gpio"; - ti,hwmods = "gpio4"; - gpio-controller; @@ -1120,7 +1120,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - interrupts = <62>; - }; - -- uart0: serial@44e09000 { +- uart0: serial at 44e09000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart1"; - clock-frequency = <48000000>; @@ -1131,7 +1131,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - dma-names = "tx", "rx"; - }; - -- uart1: serial@48022000 { +- uart1: serial at 48022000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart2"; - clock-frequency = <48000000>; @@ -1142,7 +1142,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - dma-names = "tx", "rx"; - }; - -- uart2: serial@48024000 { +- uart2: serial at 48024000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart3"; - clock-frequency = <48000000>; @@ -1153,7 +1153,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - dma-names = "tx", "rx"; - }; - -- uart3: serial@481a6000 { +- uart3: serial at 481a6000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart4"; - clock-frequency = <48000000>; @@ -1162,7 +1162,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- uart4: serial@481a8000 { +- uart4: serial at 481a8000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart5"; - clock-frequency = <48000000>; @@ -1171,7 +1171,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- uart5: serial@481aa000 { +- uart5: serial at 481aa000 { - compatible = "ti,am3352-uart", "ti,omap3-uart"; - ti,hwmods = "uart6"; - clock-frequency = <48000000>; @@ -1180,7 +1180,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- i2c0: i2c@44e0b000 { +- i2c0: i2c at 44e0b000 { - compatible = "ti,omap4-i2c"; - #address-cells = <1>; - #size-cells = <0>; @@ -1190,7 +1190,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- i2c1: i2c@4802a000 { +- i2c1: i2c at 4802a000 { - compatible = "ti,omap4-i2c"; - #address-cells = <1>; - #size-cells = <0>; @@ -1200,7 +1200,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- i2c2: i2c@4819c000 { +- i2c2: i2c at 4819c000 { - compatible = "ti,omap4-i2c"; - #address-cells = <1>; - #size-cells = <0>; @@ -1210,7 +1210,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- mmc1: mmc@48060000 { +- mmc1: mmc at 48060000 { - compatible = "ti,omap4-hsmmc"; - ti,hwmods = "mmc1"; - ti,dual-volt; @@ -1224,7 +1224,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- mmc2: mmc@481d8000 { +- mmc2: mmc at 481d8000 { - compatible = "ti,omap4-hsmmc"; - ti,hwmods = "mmc2"; - ti,needs-special-reset; @@ -1236,28 +1236,28 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - - mmc3: mmc@47810000 { + mmc3: mmc at 47810000 { compatible = "ti,omap4-hsmmc"; ti,hwmods = "mmc3"; @@ -466,157 +243,6 @@ status = "disabled"; }; -- hwspinlock: spinlock@480ca000 { +- hwspinlock: spinlock at 480ca000 { - compatible = "ti,omap4-hwspinlock"; - reg = <0x480ca000 0x1000>; - ti,hwmods = "spinlock"; - #hwlock-cells = <1>; - }; - -- wdt2: wdt@44e35000 { +- wdt2: wdt at 44e35000 { - compatible = "ti,omap3-wdt"; - ti,hwmods = "wd_timer2"; - reg = <0x44e35000 0x1000>; - interrupts = <91>; - }; - -- dcan0: can@481cc000 { +- dcan0: can at 481cc000 { - compatible = "ti,am3352-d_can"; - ti,hwmods = "d_can0"; - reg = <0x481cc000 0x2000>; @@ -1268,7 +1268,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- dcan1: can@481d0000 { +- dcan1: can at 481d0000 { - compatible = "ti,am3352-d_can"; - ti,hwmods = "d_can1"; - reg = <0x481d0000 0x2000>; @@ -1279,7 +1279,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- mailbox: mailbox@480c8000 { +- mailbox: mailbox at 480c8000 { - compatible = "ti,omap4-mailbox"; - reg = <0x480C8000 0x200>; - interrupts = <77>; @@ -1294,7 +1294,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- timer1: timer@44e31000 { +- timer1: timer at 44e31000 { - compatible = "ti,am335x-timer-1ms"; - reg = <0x44e31000 0x400>; - interrupts = <67>; @@ -1304,7 +1304,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - clock-names = "fck"; - }; - -- timer2: timer@48040000 { +- timer2: timer at 48040000 { - compatible = "ti,am335x-timer"; - reg = <0x48040000 0x400>; - interrupts = <68>; @@ -1313,14 +1313,14 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - clock-names = "fck"; - }; - -- timer3: timer@48042000 { +- timer3: timer at 48042000 { - compatible = "ti,am335x-timer"; - reg = <0x48042000 0x400>; - interrupts = <69>; - ti,hwmods = "timer3"; - }; - -- timer4: timer@48044000 { +- timer4: timer at 48044000 { - compatible = "ti,am335x-timer"; - reg = <0x48044000 0x400>; - interrupts = <92>; @@ -1328,7 +1328,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - ti,timer-pwm; - }; - -- timer5: timer@48046000 { +- timer5: timer at 48046000 { - compatible = "ti,am335x-timer"; - reg = <0x48046000 0x400>; - interrupts = <93>; @@ -1336,7 +1336,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - ti,timer-pwm; - }; - -- timer6: timer@48048000 { +- timer6: timer at 48048000 { - compatible = "ti,am335x-timer"; - reg = <0x48048000 0x400>; - interrupts = <94>; @@ -1344,7 +1344,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - ti,timer-pwm; - }; - -- timer7: timer@4804a000 { +- timer7: timer at 4804a000 { - compatible = "ti,am335x-timer"; - reg = <0x4804a000 0x400>; - interrupts = <95>; @@ -1352,7 +1352,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - ti,timer-pwm; - }; - -- rtc: rtc@44e3e000 { +- rtc: rtc at 44e3e000 { - compatible = "ti,am3352-rtc", "ti,da830-rtc"; - reg = <0x44e3e000 0x1000>; - interrupts = <75 @@ -1362,7 +1362,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - clock-names = "int-clk"; - }; - -- spi0: spi@48030000 { +- spi0: spi at 48030000 { - compatible = "ti,omap4-mcspi"; - #address-cells = <1>; - #size-cells = <0>; @@ -1378,7 +1378,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- spi1: spi@481a0000 { +- spi1: spi at 481a0000 { - compatible = "ti,omap4-mcspi"; - #address-cells = <1>; - #size-cells = <0>; @@ -1394,14 +1394,14 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - - usb: usb@47400000 { + usb: usb at 47400000 { compatible = "ti,am33xx-usb"; reg = <0x47400000 0x1000>; @@ -747,163 +373,6 @@ }; }; -- epwmss0: epwmss@48300000 { +- epwmss0: epwmss at 48300000 { - compatible = "ti,am33xx-pwmss"; - reg = <0x48300000 0x10>; - ti,hwmods = "epwmss0"; @@ -1412,7 +1412,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - 0x48300180 0x48300180 0x80 /* EQEP */ - 0x48300200 0x48300200 0x80>; /* EHRPWM */ - -- ecap0: ecap@48300100 { +- ecap0: ecap at 48300100 { - compatible = "ti,am3352-ecap", - "ti,am33xx-ecap"; - #pwm-cells = <3>; @@ -1424,7 +1424,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- ehrpwm0: pwm@48300200 { +- ehrpwm0: pwm at 48300200 { - compatible = "ti,am3352-ehrpwm", - "ti,am33xx-ehrpwm"; - #pwm-cells = <3>; @@ -1435,7 +1435,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- epwmss1: epwmss@48302000 { +- epwmss1: epwmss at 48302000 { - compatible = "ti,am33xx-pwmss"; - reg = <0x48302000 0x10>; - ti,hwmods = "epwmss1"; @@ -1446,7 +1446,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - 0x48302180 0x48302180 0x80 /* EQEP */ - 0x48302200 0x48302200 0x80>; /* EHRPWM */ - -- ecap1: ecap@48302100 { +- ecap1: ecap at 48302100 { - compatible = "ti,am3352-ecap", - "ti,am33xx-ecap"; - #pwm-cells = <3>; @@ -1458,7 +1458,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- ehrpwm1: pwm@48302200 { +- ehrpwm1: pwm at 48302200 { - compatible = "ti,am3352-ehrpwm", - "ti,am33xx-ehrpwm"; - #pwm-cells = <3>; @@ -1469,7 +1469,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- epwmss2: epwmss@48304000 { +- epwmss2: epwmss at 48304000 { - compatible = "ti,am33xx-pwmss"; - reg = <0x48304000 0x10>; - ti,hwmods = "epwmss2"; @@ -1480,7 +1480,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - 0x48304180 0x48304180 0x80 /* EQEP */ - 0x48304200 0x48304200 0x80>; /* EHRPWM */ - -- ecap2: ecap@48304100 { +- ecap2: ecap at 48304100 { - compatible = "ti,am3352-ecap", - "ti,am33xx-ecap"; - #pwm-cells = <3>; @@ -1492,7 +1492,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- ehrpwm2: pwm@48304200 { +- ehrpwm2: pwm at 48304200 { - compatible = "ti,am3352-ehrpwm", - "ti,am33xx-ehrpwm"; - #pwm-cells = <3>; @@ -1503,7 +1503,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - -- mac: ethernet@4a100000 { +- mac: ethernet at 4a100000 { - compatible = "ti,am335x-cpsw","ti,cpsw"; - ti,hwmods = "cpgmac0"; - clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>; @@ -1531,7 +1531,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - syscon = <&scm_conf>; - status = "disabled"; - -- davinci_mdio: mdio@4a101000 { +- davinci_mdio: mdio at 4a101000 { - compatible = "ti,cpsw-mdio","ti,davinci_mdio"; - #address-cells = <1>; - #size-cells = <0>; @@ -1541,31 +1541,31 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.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,am3352-cpsw-phy-sel"; - reg= <0x44e10650 0x4>; - reg-names = "gmii-sel"; - }; - }; - - ocmcram: ocmcram@40300000 { + ocmcram: ocmcram at 40300000 { compatible = "mmio-sram"; reg = <0x40300000 0x10000>; /* 64k */ @@ -924,40 +393,6 @@ }; }; -- elm: elm@48080000 { +- elm: elm at 48080000 { - compatible = "ti,am3352-elm"; - reg = <0x48080000 0x2000>; - interrupts = <4>; @@ -1573,7 +1573,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- lcdc: lcdc@4830e000 { +- lcdc: lcdc at 4830e000 { - compatible = "ti,am33xx-tilcdc"; - reg = <0x4830e000 0x1000>; - interrupts = <36>; @@ -1581,7 +1581,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - status = "disabled"; - }; - -- tscadc: tscadc@44e0d000 { +- tscadc: tscadc at 44e0d000 { - compatible = "ti,am3359-tscadc"; - reg = <0x44e0d000 0x1000>; - interrupts = <16>; @@ -1599,7 +1599,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - }; - }; - - emif: emif@4c000000 { + emif: emif at 4c000000 { compatible = "ti,emif-am3352"; reg = <0x4c000000 0x1000000>; @@ -1005,42 +440,8 @@ @@ -1607,7 +1607,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi dma-names = "tx", "rx"; }; - -- mcasp0: mcasp@48038000 { +- mcasp0: mcasp at 48038000 { - compatible = "ti,am33xx-mcasp-audio"; - ti,hwmods = "mcasp0"; - reg = <0x48038000 0x2000>, @@ -1621,7 +1621,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - dma-names = "tx", "rx"; - }; - -- mcasp1: mcasp@4803c000 { +- mcasp1: mcasp at 4803c000 { - compatible = "ti,am33xx-mcasp-audio"; - ti,hwmods = "mcasp1"; - reg = <0x4803C000 0x2000>, @@ -1635,7 +1635,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi - dma-names = "tx", "rx"; - }; - -- rng: rng@48310000 { +- rng: rng at 48310000 { - compatible = "ti,omap4-rng"; - ti,hwmods = "rng"; - reg = <0x48310000 0x2000>; diff --git a/a/content_digest b/N1/content_digest index da65619..c0e4c1c 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 4/4] ARM: dts: am335x: Move l4 child devices to probe them with ti-sysc\0" "Date\0Mon, 24 Sep 2018 17:05:45 -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" @@ -43,8 +37,8 @@ " \tpinctrl-1 = <&cpsw_sleep>;\n" " \tstatus = \"okay\";\n" " \tslaves = <1>;\n" - "-\tcpsw_emac0: slave@4a100200 {\n" - "+\tcpsw_emac0: slave@200 {\n" + "-\tcpsw_emac0: slave at 4a100200 {\n" + "+\tcpsw_emac0: slave at 200 {\n" " \t\tphy-mode = \"mii\";\n" " \t\tphy-handle = <ðernetphy0>;\n" " \t};\n" @@ -54,7 +48,7 @@ "@@ -31,11 +31,13 @@\n" " \t\t\t <0x00082000 0x00182000 0x001000>;\t/* ap 7 */\n" " \n" - " \t\ttarget-module@0 {\t\t\t/* 0x44d00000, ap 4 28.0 */\n" + " \t\ttarget-module at 0 {\t\t\t/* 0x44d00000, ap 4 28.0 */\n" "-\t\t\tcompatible = \"ti,sysc\";\n" "-\t\t\tstatus = \"disabled\";\n" "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n" @@ -66,11 +60,11 @@ "+\t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - " \t\ttarget-module@80000 {\t\t\t/* 0x44d80000, ap 6 10.0 */\n" + " \t\ttarget-module at 80000 {\t\t\t/* 0x44d80000, ap 6 10.0 */\n" "@@ -85,11 +87,28 @@\n" " \t\t\t <0x00080000 0x00280000 0x001000>;\t/* ap 39 */\n" " \n" - " \t\ttarget-module@0 {\t\t\t/* 0x44e00000, ap 8 58.0 */\n" + " \t\ttarget-module at 0 {\t\t\t/* 0x44e00000, 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" @@ -80,7 +74,7 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0x0 0x0 0x2000>;\n" "+\n" - "+\t\t\tprcm: prcm@0 {\n" + "+\t\t\tprcm: prcm at 0 {\n" "+\t\t\t\tcompatible = \"ti,am3-prcm\", \"simple-bus\";\n" "+\t\t\t\treg = <0 0x2000>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -97,13 +91,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@3000 {\t\t\t/* 0x44e03000, ap 10 0a.0 */\n" + " \t\ttarget-module at 3000 {\t\t\t/* 0x44e03000, ap 10 0a.0 */\n" "@@ -130,6 +149,16 @@\n" " \t\t\t#address-cells = <1>;\n" " \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,omap4-gpio\";\n" "+\t\t\t\tgpio-controller;\n" "+\t\t\t\t#gpio-cells = <2>;\n" @@ -114,13 +108,13 @@ "+\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" "@@ -152,6 +181,16 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -131,13 +125,13 @@ "+\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" "@@ -176,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,omap4-i2c\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -147,13 +141,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" "@@ -195,15 +243,90 @@\n" " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0x00000000 0x0000d000 0x00001000>,\n" " \t\t\t\t <0x00001000 0x0000e000 0x00001000>;\n" "+\n" - "+\t\t\t\ttscadc: tscadc@0 {\n" + "+\t\t\t\ttscadc: tscadc at 0 {\n" "+\t\t\t\t\tcompatible = \"ti,am3359-tscadc\";\n" "+\t\t\t\t\treg = <0x0 0x1000>;\n" "+\t\t\t\t\tinterrupts = <16>;\n" @@ -171,7 +165,7 @@ "+\t\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" @@ -182,7 +176,7 @@ " \t\t\tranges = <0x00000000 0x00010000 0x00010000>,\n" " \t\t\t\t <0x00010000 0x00020000 0x00010000>;\n" "+\n" - "+\t\t\tscm: scm@0 {\n" + "+\t\t\tscm: scm at 0 {\n" "+\t\t\t\tcompatible = \"ti,am3-scm\", \"simple-bus\";\n" "+\t\t\t\treg = <0x0 0x2000>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -190,13 +184,13 @@ "+\t\t\t\t#pinctrl-cells = <1>;\n" "+\t\t\t\tranges = <0 0 0x2000>;\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,am3352-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\tam33xx_pinmux: pinmux@800 {\n" + "+\t\t\t\tam33xx_pinmux: pinmux at 800 {\n" "+\t\t\t\t\tcompatible = \"pinctrl-single\";\n" "+\t\t\t\t\treg = <0x800 0x238>;\n" "+\t\t\t\t\t#address-cells = <1>;\n" @@ -206,7 +200,7 @@ "+\t\t\t\t\tpinctrl-single,function-mask = <0x7f>;\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\", \"simple-bus\";\n" "+\t\t\t\t\treg = <0x0 0x800>;\n" "+\t\t\t\t\t#address-cells = <1>;\n" @@ -219,7 +213,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,am3352-wkup-m3-ipc\";\n" "+\t\t\t\t\treg = <0x1324 0x24>;\n" "+\t\t\t\t\tinterrupts = <78>;\n" @@ -227,7 +221,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" @@ -240,13 +234,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@31000 {\t\t\t/* 0x44e31000, ap 25 40.0 */\n" + " \t\ttarget-module at 31000 {\t\t\t/* 0x44e31000, ap 25 40.0 */\n" "@@ -226,6 +349,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,am335x-timer-1ms\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <67>;\n" @@ -256,26 +250,26 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@33000 {\t\t\t/* 0x44e33000, ap 27 18.0 */\n" + " \t\ttarget-module at 33000 {\t\t\t/* 0x44e33000, ap 27 18.0 */\n" "@@ -256,6 +388,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\twdt2: wdt@0 {\n" + "+\t\t\twdt2: wdt at 0 {\n" "+\t\t\t\tcompatible = \"ti,omap3-wdt\";\n" "+\t\t\t\treg = <0x0 0x1000>;\n" "+\t\t\t\tinterrupts = <91>;\n" "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@37000 {\t\t\t/* 0x44e37000, ap 31 08.0 */\n" + " \t\ttarget-module at 37000 {\t\t\t/* 0x44e37000, ap 31 08.0 */\n" "@@ -290,6 +428,13 @@\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,am3352-rtc\", \"ti,da830-rtc\";\n" "+\t\t\t\treg = <0x0 0x1000>;\n" "+\t\t\t\tinterrupts = <75\n" @@ -283,11 +277,11 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@40000 {\t\t\t/* 0x44e40000, ap 38 68.0 */\n" + " \t\ttarget-module at 40000 {\t\t\t/* 0x44e40000, ap 38 68.0 */\n" "@@ -529,11 +674,72 @@\n" " \t\t\t <0x00380000 0x00380000 0x001000>;\t/* ap 10 */\n" " \n" - " \t\ttarget-module@100000 {\t\t\t/* 0x4a100000, ap 3 08.0 */\n" + " \t\ttarget-module at 100000 {\t\t\t/* 0x4a100000, ap 3 08.0 */\n" "-\t\t\tcompatible = \"ti,sysc\";\n" "-\t\t\tstatus = \"disabled\";\n" "+\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" @@ -308,7 +302,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,am335x-cpsw\",\"ti,cpsw\";\n" "+\t\t\t\tclocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;\n" "+\t\t\t\tclock-names = \"fck\", \"cpts\";\n" @@ -336,7 +330,7 @@ "+\t\t\t\tcpsw-phy-sel = <&phy_sel>;\n" "+\t\t\t\tstatus = \"disabled\";\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,cpsw-mdio\",\"ti,davinci_mdio\";\n" "+\t\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t\t#size-cells = <0>;\n" @@ -346,25 +340,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@180000 {\t\t\t/* 0x4a180000, ap 5 10.0 */\n" + " \t\ttarget-module at 180000 {\t\t\t/* 0x4a180000, ap 5 10.0 */\n" "@@ -721,6 +927,16 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -375,13 +369,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@24000 {\t\t\t/* 0x48024000, ap 12 14.0 */\n" + " \t\ttarget-module at 24000 {\t\t\t/* 0x48024000, ap 12 14.0 */\n" "@@ -743,6 +959,16 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -392,13 +386,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@2a000 {\t\t\t/* 0x4802a000, ap 14 2a.0 */\n" + " \t\ttarget-module at 2a000 {\t\t\t/* 0x4802a000, ap 14 2a.0 */\n" "@@ -767,6 +993,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,omap4-i2c\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -408,13 +402,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@30000 {\t\t\t/* 0x48030000, ap 77 08.0 */\n" + " \t\ttarget-module at 30000 {\t\t\t/* 0x48030000, ap 77 08.0 */\n" "@@ -789,6 +1024,21 @@\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,omap4-mcspi\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -430,13 +424,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@38000 {\t\t\t/* 0x48038000, ap 16 02.0 */\n" + " \t\ttarget-module at 38000 {\t\t\t/* 0x48038000, ap 16 02.0 */\n" "@@ -806,6 +1056,19 @@\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" @@ -450,13 +444,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@3c000 {\t\t\t/* 0x4803c000, ap 20 32.0 */\n" + " \t\ttarget-module at 3c000 {\t\t\t/* 0x4803c000, ap 20 32.0 */\n" "@@ -823,6 +1086,19 @@\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" @@ -470,13 +464,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@40000 {\t\t\t/* 0x48040000, ap 22 1e.0 */\n" + " \t\ttarget-module at 40000 {\t\t\t/* 0x48040000, ap 22 1e.0 */\n" "@@ -843,6 +1119,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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <68>;\n" @@ -485,26 +479,26 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@42000 {\t\t\t/* 0x48042000, ap 24 1c.0 */\n" + " \t\ttarget-module at 42000 {\t\t\t/* 0x48042000, ap 24 1c.0 */\n" "@@ -863,6 +1147,12 @@\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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <69>;\n" "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@44000 {\t\t\t/* 0x48044000, ap 26 26.0 */\n" + " \t\ttarget-module at 44000 {\t\t\t/* 0x48044000, ap 26 26.0 */\n" "@@ -883,6 +1173,13 @@\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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <92>;\n" @@ -512,13 +506,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@46000 {\t\t\t/* 0x48046000, ap 28 28.0 */\n" + " \t\ttarget-module at 46000 {\t\t\t/* 0x48046000, ap 28 28.0 */\n" "@@ -903,6 +1200,13 @@\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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <93>;\n" @@ -526,13 +520,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@48000 {\t\t\t/* 0x48048000, ap 30 22.0 */\n" + " \t\ttarget-module at 48000 {\t\t\t/* 0x48048000, ap 30 22.0 */\n" "@@ -923,6 +1227,13 @@\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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <94>;\n" @@ -540,13 +534,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@4a000 {\t\t\t/* 0x4804a000, ap 85 60.0 */\n" + " \t\ttarget-module at 4a000 {\t\t\t/* 0x4804a000, ap 85 60.0 */\n" "@@ -943,6 +1254,13 @@\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,am335x-timer\";\n" "+\t\t\t\treg = <0x0 0x400>;\n" "+\t\t\t\tinterrupts = <95>;\n" @@ -554,13 +548,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@4c000 {\t\t\t/* 0x4804c000, ap 32 36.0 */\n" + " \t\ttarget-module at 4c000 {\t\t\t/* 0x4804c000, ap 32 36.0 */\n" "@@ -967,6 +1285,16 @@\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,omap4-gpio\";\n" "+\t\t\t\tgpio-controller;\n" "+\t\t\t\t#gpio-cells = <2>;\n" @@ -571,13 +565,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@50000 {\t\t\t/* 0x48050000, ap 34 2c.0 */\n" + " \t\ttarget-module at 50000 {\t\t\t/* 0x48050000, ap 34 2c.0 */\n" "@@ -998,6 +1326,19 @@\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\tti,dual-volt;\n" "+\t\t\t\tti,needs-special-reset;\n" @@ -591,13 +585,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@80000 {\t\t\t/* 0x48080000, ap 38 18.0 */\n" + " \t\ttarget-module at 80000 {\t\t\t/* 0x48080000, ap 38 18.0 */\n" "@@ -1020,6 +1361,13 @@\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 = <4>;\n" @@ -605,13 +599,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@a0000 {\t\t\t/* 0x480a0000, ap 40 5e.0 */\n" + " \t\ttarget-module at a0000 {\t\t\t/* 0x480a0000, ap 40 5e.0 */\n" "@@ -1046,6 +1394,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 = <77>;\n" @@ -626,26 +620,26 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@ca000 {\t\t\t/* 0x480ca000, ap 91 40.0 */\n" + " \t\ttarget-module at ca000 {\t\t\t/* 0x480ca000, ap 91 40.0 */\n" "@@ -1069,6 +1431,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" "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@cc000 {\t\t\t/* 0x480cc000, ap 89 0e.0 */\n" + " \t\ttarget-module at cc000 {\t\t\t/* 0x480cc000, ap 89 0e.0 */\n" "@@ -1153,6 +1521,15 @@\n" " \t\t\t#address-cells = <1>;\n" " \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,omap4-i2c\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -655,13 +649,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@a0000 {\t\t\t/* 0x481a0000, ap 79 24.0 */\n" + " \t\ttarget-module at a0000 {\t\t\t/* 0x481a0000, ap 79 24.0 */\n" "@@ -1175,6 +1552,21 @@\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,omap4-mcspi\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -677,13 +671,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@a2000 {\t\t\t/* 0x481a2000, ap 81 2e.0 */\n" + " \t\ttarget-module at a2000 {\t\t\t/* 0x481a2000, ap 81 2e.0 */\n" "@@ -1213,6 +1605,14 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -692,13 +686,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@a8000 {\t\t\t/* 0x481a8000, ap 50 20.0 */\n" + " \t\ttarget-module at a8000 {\t\t\t/* 0x481a8000, ap 50 20.0 */\n" "@@ -1235,6 +1635,14 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -707,13 +701,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@aa000 {\t\t\t/* 0x481aa000, ap 52 1a.0 */\n" + " \t\ttarget-module at aa000 {\t\t\t/* 0x481aa000, ap 52 1a.0 */\n" "@@ -1257,6 +1665,14 @@\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,am3352-uart\", \"ti,omap3-uart\";\n" "+\t\t\t\tclock-frequency = <48000000>;\n" "+\t\t\t\treg = <0x0 0x2000>;\n" @@ -722,13 +716,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@ac000 {\t\t\t/* 0x481ac000, ap 54 38.0 */\n" + " \t\ttarget-module at ac000 {\t\t\t/* 0x481ac000, ap 54 38.0 */\n" "@@ -1281,6 +1697,16 @@\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,omap4-gpio\";\n" "+\t\t\t\tgpio-controller;\n" "+\t\t\t\t#gpio-cells = <2>;\n" @@ -739,13 +733,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@ae000 {\t\t\t/* 0x481ae000, ap 56 3a.0 */\n" + " \t\ttarget-module at ae000 {\t\t\t/* 0x481ae000, ap 56 3a.0 */\n" "@@ -1305,6 +1731,16 @@\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,omap4-gpio\";\n" "+\t\t\t\tgpio-controller;\n" "+\t\t\t\t#gpio-cells = <2>;\n" @@ -756,11 +750,11 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@b0000 {\t\t\t/* 0x481b0000, ap 58 50.0 */\n" + " \t\ttarget-module at b0000 {\t\t\t/* 0x481b0000, ap 58 50.0 */\n" "@@ -1316,19 +1752,49 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@cc000 {\t\t\t/* 0x481cc000, ap 60 46.0 */\n" + " \t\ttarget-module at cc000 {\t\t\t/* 0x481cc000, ap 60 46.0 */\n" "-\t\t\tcompatible = \"ti,sysc\";\n" "-\t\t\tstatus = \"disabled\";\n" "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n" @@ -774,7 +768,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,am3352-d_can\";\n" "+\t\t\t\treg = <0x0 0x2000>;\n" "+\t\t\t\tclocks = <&dcan0_fck>;\n" @@ -785,7 +779,7 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@d0000 {\t\t\t/* 0x481d0000, ap 62 42.0 */\n" + " \t\ttarget-module at d0000 {\t\t\t/* 0x481d0000, ap 62 42.0 */\n" "-\t\t\tcompatible = \"ti,sysc\";\n" "-\t\t\tstatus = \"disabled\";\n" "+\t\t\tcompatible = \"ti,sysc-omap4\", \"ti,sysc\";\n" @@ -799,7 +793,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,am3352-d_can\";\n" "+\t\t\t\treg = <0x0 0x2000>;\n" "+\t\t\t\tclocks = <&dcan1_fck>;\n" @@ -810,13 +804,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@d8000 {\t\t\t/* 0x481d8000, ap 64 66.0 */\n" + " \t\ttarget-module at d8000 {\t\t\t/* 0x481d8000, ap 64 66.0 */\n" "@@ -1352,6 +1818,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\tti,needs-special-reset;\n" "+\t\t\t\tdmas = <&edma 2 0\n" @@ -834,7 +828,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,am33xx-pwmss\";\n" "+\t\t\t\treg = <0x0 0x10>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -844,7 +838,7 @@ "+\t\t\t\t\t 0x48300180 0x48300180 0x80 /* EQEP */\n" "+\t\t\t\t\t 0x48300200 0x48300200 0x80>; /* EHRPWM */\n" "+\n" - "+\t\t\t\tecap0: ecap@48300100 {\n" + "+\t\t\t\tecap0: ecap at 48300100 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ecap\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -856,7 +850,7 @@ "+\t\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tehrpwm0: pwm@48300200 {\n" + "+\t\t\t\tehrpwm0: pwm at 48300200 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ehrpwm\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -868,13 +862,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@2000 {\t\t\t/* 0x48302000, ap 68 52.0 */\n" + " \t\ttarget-module at 2000 {\t\t\t/* 0x48302000, ap 68 52.0 */\n" "@@ -1431,6 +1941,39 @@\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,am33xx-pwmss\";\n" "+\t\t\t\treg = <0x0 0x10>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -884,7 +878,7 @@ "+\t\t\t\t\t 0x48302180 0x48302180 0x80 /* EQEP */\n" "+\t\t\t\t\t 0x48302200 0x48302200 0x80>; /* EHRPWM */\n" "+\n" - "+\t\t\t\tecap1: ecap@48302100 {\n" + "+\t\t\t\tecap1: ecap at 48302100 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ecap\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -896,7 +890,7 @@ "+\t\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tehrpwm1: pwm@48302200 {\n" + "+\t\t\t\tehrpwm1: pwm at 48302200 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ehrpwm\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -908,13 +902,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@4000 {\t\t\t/* 0x48304000, ap 70 44.0 */\n" + " \t\ttarget-module at 4000 {\t\t\t/* 0x48304000, ap 70 44.0 */\n" "@@ -1453,6 +1996,39 @@\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,am33xx-pwmss\";\n" "+\t\t\t\treg = <0x0 0x10>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -924,7 +918,7 @@ "+\t\t\t\t\t 0x48304180 0x48304180 0x80 /* EQEP */\n" "+\t\t\t\t\t 0x48304200 0x48304200 0x80>; /* EHRPWM */\n" "+\n" - "+\t\t\t\tecap2: ecap@48304100 {\n" + "+\t\t\t\tecap2: ecap at 48304100 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ecap\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -936,7 +930,7 @@ "+\t\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tehrpwm2: pwm@48304200 {\n" + "+\t\t\t\tehrpwm2: pwm at 48304200 {\n" "+\t\t\t\t\tcompatible = \"ti,am3352-ehrpwm\",\n" "+\t\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "+\t\t\t\t\t#pwm-cells = <3>;\n" @@ -948,13 +942,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@e000 {\t\t\t/* 0x4830e000, ap 72 4a.0 */\n" + " \t\ttarget-module at e000 {\t\t\t/* 0x4830e000, ap 72 4a.0 */\n" "@@ -1471,6 +2047,13 @@\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0x0 0xe000 0x1000>;\n" "+\n" - "+\t\t\tlcdc: lcdc@0 {\n" + "+\t\t\tlcdc: lcdc at 0 {\n" "+\t\t\t\tcompatible = \"ti,am33xx-tilcdc\";\n" "+\t\t\t\treg = <0x0 0x1000>;\n" "+\t\t\t\tinterrupts = <36>;\n" @@ -962,20 +956,20 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@10000 {\t\t\t/* 0x48310000, ap 76 4e.1 */\n" + " \t\ttarget-module at 10000 {\t\t\t/* 0x48310000, ap 76 4e.1 */\n" "@@ -1488,6 +2071,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 = <111>;\n" "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttarget-module@13000 {\t\t\t/* 0x48313000, ap 97 62.0 */\n" + " \t\ttarget-module at 13000 {\t\t\t/* 0x48313000, ap 97 62.0 */\n" "diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi\n" "--- a/arch/arm/boot/dts/am33xx.dtsi\n" "+++ b/arch/arm/boot/dts/am33xx.dtsi\n" @@ -991,14 +985,14 @@ " \t\tranges;\n" " \t\tti,hwmods = \"l3_main\";\n" " \n" - "-\t\tl4_wkup: l4_wkup@44c00000 {\n" + "-\t\tl4_wkup: l4_wkup at 44c00000 {\n" "-\t\t\tcompatible = \"ti,am3-l4-wkup\", \"simple-bus\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <1>;\n" "-\t\t\tranges = <0 0x44c00000 0x280000>;\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,am3352-wkup-m3\";\n" " \t\t\t\treg = <0x100000 0x4000>,\n" "-\t\t\t\t <0x180000\t0x2000>;\n" @@ -1008,7 +1002,7 @@ " \t\t\t\tti,pm-firmware = \"am335x-pm-firmware.elf\";\n" " \t\t\t};\n" "-\n" - "-\t\t\tprcm: prcm@200000 {\n" + "-\t\t\tprcm: prcm at 200000 {\n" "-\t\t\t\tcompatible = \"ti,am3-prcm\", \"simple-bus\";\n" "-\t\t\t\treg = <0x200000 0x4000>;\n" "-\t\t\t\t#address-cells = <1>;\n" @@ -1024,7 +1018,7 @@ "-\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,am3-scm\", \"simple-bus\";\n" "-\t\t\t\treg = <0x210000 0x2000>;\n" "-\t\t\t\t#address-cells = <1>;\n" @@ -1032,7 +1026,7 @@ "-\t\t\t\t#pinctrl-cells = <1>;\n" "-\t\t\t\tranges = <0 0x210000 0x2000>;\n" "-\n" - "-\t\t\t\tam33xx_pinmux: pinmux@800 {\n" + "-\t\t\t\tam33xx_pinmux: pinmux at 800 {\n" "-\t\t\t\t\tcompatible = \"pinctrl-single\";\n" "-\t\t\t\t\treg = <0x800 0x238>;\n" "-\t\t\t\t\t#address-cells = <1>;\n" @@ -1042,7 +1036,7 @@ "-\t\t\t\t\tpinctrl-single,function-mask = <0x7f>;\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\", \"simple-bus\";\n" "-\t\t\t\t\treg = <0x0 0x800>;\n" "-\t\t\t\t\t#address-cells = <1>;\n" @@ -1055,7 +1049,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,am3352-wkup-m3-ipc\";\n" "-\t\t\t\t\treg = <0x1324 0x24>;\n" "-\t\t\t\t\tinterrupts = <78>;\n" @@ -1063,7 +1057,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" @@ -1075,21 +1069,21 @@ "-\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_fw: interconnect@47c00000 {\n" + "+\t\tl4_fw: interconnect at 47c00000 {\n" "+\t\t};\n" - "+\t\tl4_fast: interconnect@4a000000 {\n" + "+\t\tl4_fast: interconnect at 4a000000 {\n" "+\t\t};\n" - "+\t\tl4_mpuss: interconnect@4b140000 {\n" + "+\t\tl4_mpuss: interconnect at 4b140000 {\n" " \t\t};\n" " \n" - " \t\tintc: interrupt-controller@48200000 {\n" + " \t\tintc: interrupt-controller at 48200000 {\n" "@@ -297,166 +234,6 @@\n" " \t\t\tinterrupt-names = \"edma3_tcerrint\";\n" " \t\t};\n" " \n" - "-\t\tgpio0: gpio@44e07000 {\n" + "-\t\tgpio0: gpio at 44e07000 {\n" "-\t\t\tcompatible = \"ti,omap4-gpio\";\n" "-\t\t\tti,hwmods = \"gpio1\";\n" "-\t\t\tgpio-controller;\n" @@ -1100,7 +1094,7 @@ "-\t\t\tinterrupts = <96>;\n" "-\t\t};\n" "-\n" - "-\t\tgpio1: gpio@4804c000 {\n" + "-\t\tgpio1: gpio at 4804c000 {\n" "-\t\t\tcompatible = \"ti,omap4-gpio\";\n" "-\t\t\tti,hwmods = \"gpio2\";\n" "-\t\t\tgpio-controller;\n" @@ -1111,7 +1105,7 @@ "-\t\t\tinterrupts = <98>;\n" "-\t\t};\n" "-\n" - "-\t\tgpio2: gpio@481ac000 {\n" + "-\t\tgpio2: gpio at 481ac000 {\n" "-\t\t\tcompatible = \"ti,omap4-gpio\";\n" "-\t\t\tti,hwmods = \"gpio3\";\n" "-\t\t\tgpio-controller;\n" @@ -1122,7 +1116,7 @@ "-\t\t\tinterrupts = <32>;\n" "-\t\t};\n" "-\n" - "-\t\tgpio3: gpio@481ae000 {\n" + "-\t\tgpio3: gpio at 481ae000 {\n" "-\t\t\tcompatible = \"ti,omap4-gpio\";\n" "-\t\t\tti,hwmods = \"gpio4\";\n" "-\t\t\tgpio-controller;\n" @@ -1133,7 +1127,7 @@ "-\t\t\tinterrupts = <62>;\n" "-\t\t};\n" "-\n" - "-\t\tuart0: serial@44e09000 {\n" + "-\t\tuart0: serial at 44e09000 {\n" "-\t\t\tcompatible = \"ti,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart1\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1144,7 +1138,7 @@ "-\t\t\tdma-names = \"tx\", \"rx\";\n" "-\t\t};\n" "-\n" - "-\t\tuart1: serial@48022000 {\n" + "-\t\tuart1: serial at 48022000 {\n" "-\t\t\tcompatible = \"ti,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart2\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1155,7 +1149,7 @@ "-\t\t\tdma-names = \"tx\", \"rx\";\n" "-\t\t};\n" "-\n" - "-\t\tuart2: serial@48024000 {\n" + "-\t\tuart2: serial at 48024000 {\n" "-\t\t\tcompatible = \"ti,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart3\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1166,7 +1160,7 @@ "-\t\t\tdma-names = \"tx\", \"rx\";\n" "-\t\t};\n" "-\n" - "-\t\tuart3: serial@481a6000 {\n" + "-\t\tuart3: serial at 481a6000 {\n" "-\t\t\tcompatible = \"ti,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart4\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1175,7 +1169,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,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart5\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1184,7 +1178,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,am3352-uart\", \"ti,omap3-uart\";\n" "-\t\t\tti,hwmods = \"uart6\";\n" "-\t\t\tclock-frequency = <48000000>;\n" @@ -1193,7 +1187,7 @@ "-\t\t\tstatus = \"disabled\";\n" "-\t\t};\n" "-\n" - "-\t\ti2c0: i2c@44e0b000 {\n" + "-\t\ti2c0: i2c at 44e0b000 {\n" "-\t\t\tcompatible = \"ti,omap4-i2c\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <0>;\n" @@ -1203,7 +1197,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,omap4-i2c\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <0>;\n" @@ -1213,7 +1207,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,omap4-i2c\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <0>;\n" @@ -1223,7 +1217,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\tti,hwmods = \"mmc1\";\n" "-\t\t\tti,dual-volt;\n" @@ -1237,7 +1231,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\tti,hwmods = \"mmc2\";\n" "-\t\t\tti,needs-special-reset;\n" @@ -1249,28 +1243,28 @@ "-\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\tti,hwmods = \"mmc3\";\n" "@@ -466,157 +243,6 @@\n" " \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\twdt2: wdt@44e35000 {\n" + "-\t\twdt2: wdt at 44e35000 {\n" "-\t\t\tcompatible = \"ti,omap3-wdt\";\n" "-\t\t\tti,hwmods = \"wd_timer2\";\n" "-\t\t\treg = <0x44e35000 0x1000>;\n" "-\t\t\tinterrupts = <91>;\n" "-\t\t};\n" "-\n" - "-\t\tdcan0: can@481cc000 {\n" + "-\t\tdcan0: can at 481cc000 {\n" "-\t\t\tcompatible = \"ti,am3352-d_can\";\n" "-\t\t\tti,hwmods = \"d_can0\";\n" "-\t\t\treg = <0x481cc000 0x2000>;\n" @@ -1281,7 +1275,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,am3352-d_can\";\n" "-\t\t\tti,hwmods = \"d_can1\";\n" "-\t\t\treg = <0x481d0000 0x2000>;\n" @@ -1292,7 +1286,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 = <77>;\n" @@ -1307,7 +1301,7 @@ "-\t\t\t};\n" "-\t\t};\n" "-\n" - "-\t\ttimer1: timer@44e31000 {\n" + "-\t\ttimer1: timer at 44e31000 {\n" "-\t\t\tcompatible = \"ti,am335x-timer-1ms\";\n" "-\t\t\treg = <0x44e31000 0x400>;\n" "-\t\t\tinterrupts = <67>;\n" @@ -1317,7 +1311,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,am335x-timer\";\n" "-\t\t\treg = <0x48040000 0x400>;\n" "-\t\t\tinterrupts = <68>;\n" @@ -1326,14 +1320,14 @@ "-\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,am335x-timer\";\n" "-\t\t\treg = <0x48042000 0x400>;\n" "-\t\t\tinterrupts = <69>;\n" "-\t\t\tti,hwmods = \"timer3\";\n" "-\t\t};\n" "-\n" - "-\t\ttimer4: timer@48044000 {\n" + "-\t\ttimer4: timer at 48044000 {\n" "-\t\t\tcompatible = \"ti,am335x-timer\";\n" "-\t\t\treg = <0x48044000 0x400>;\n" "-\t\t\tinterrupts = <92>;\n" @@ -1341,7 +1335,7 @@ "-\t\t\tti,timer-pwm;\n" "-\t\t};\n" "-\n" - "-\t\ttimer5: timer@48046000 {\n" + "-\t\ttimer5: timer at 48046000 {\n" "-\t\t\tcompatible = \"ti,am335x-timer\";\n" "-\t\t\treg = <0x48046000 0x400>;\n" "-\t\t\tinterrupts = <93>;\n" @@ -1349,7 +1343,7 @@ "-\t\t\tti,timer-pwm;\n" "-\t\t};\n" "-\n" - "-\t\ttimer6: timer@48048000 {\n" + "-\t\ttimer6: timer at 48048000 {\n" "-\t\t\tcompatible = \"ti,am335x-timer\";\n" "-\t\t\treg = <0x48048000 0x400>;\n" "-\t\t\tinterrupts = <94>;\n" @@ -1357,7 +1351,7 @@ "-\t\t\tti,timer-pwm;\n" "-\t\t};\n" "-\n" - "-\t\ttimer7: timer@4804a000 {\n" + "-\t\ttimer7: timer at 4804a000 {\n" "-\t\t\tcompatible = \"ti,am335x-timer\";\n" "-\t\t\treg = <0x4804a000 0x400>;\n" "-\t\t\tinterrupts = <95>;\n" @@ -1365,7 +1359,7 @@ "-\t\t\tti,timer-pwm;\n" "-\t\t};\n" "-\n" - "-\t\trtc: rtc@44e3e000 {\n" + "-\t\trtc: rtc at 44e3e000 {\n" "-\t\t\tcompatible = \"ti,am3352-rtc\", \"ti,da830-rtc\";\n" "-\t\t\treg = <0x44e3e000 0x1000>;\n" "-\t\t\tinterrupts = <75\n" @@ -1375,7 +1369,7 @@ "-\t\t\tclock-names = \"int-clk\";\n" "-\t\t};\n" "-\n" - "-\t\tspi0: spi@48030000 {\n" + "-\t\tspi0: spi at 48030000 {\n" "-\t\t\tcompatible = \"ti,omap4-mcspi\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <0>;\n" @@ -1391,7 +1385,7 @@ "-\t\t\tstatus = \"disabled\";\n" "-\t\t};\n" "-\n" - "-\t\tspi1: spi@481a0000 {\n" + "-\t\tspi1: spi at 481a0000 {\n" "-\t\t\tcompatible = \"ti,omap4-mcspi\";\n" "-\t\t\t#address-cells = <1>;\n" "-\t\t\t#size-cells = <0>;\n" @@ -1407,14 +1401,14 @@ "-\t\t\tstatus = \"disabled\";\n" "-\t\t};\n" "-\n" - " \t\tusb: usb@47400000 {\n" + " \t\tusb: usb at 47400000 {\n" " \t\t\tcompatible = \"ti,am33xx-usb\";\n" " \t\t\treg = <0x47400000 0x1000>;\n" "@@ -747,163 +373,6 @@\n" " \t\t\t};\n" " \t\t};\n" " \n" - "-\t\tepwmss0: epwmss@48300000 {\n" + "-\t\tepwmss0: epwmss at 48300000 {\n" "-\t\t\tcompatible = \"ti,am33xx-pwmss\";\n" "-\t\t\treg = <0x48300000 0x10>;\n" "-\t\t\tti,hwmods = \"epwmss0\";\n" @@ -1425,7 +1419,7 @@ "-\t\t\t\t 0x48300180 0x48300180 0x80 /* EQEP */\n" "-\t\t\t\t 0x48300200 0x48300200 0x80>; /* EHRPWM */\n" "-\n" - "-\t\t\tecap0: ecap@48300100 {\n" + "-\t\t\tecap0: ecap at 48300100 {\n" "-\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "-\t\t\t\t\t \"ti,am33xx-ecap\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1437,7 +1431,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,am3352-ehrpwm\",\n" "-\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1448,7 +1442,7 @@ "-\t\t\t};\n" "-\t\t};\n" "-\n" - "-\t\tepwmss1: epwmss@48302000 {\n" + "-\t\tepwmss1: epwmss at 48302000 {\n" "-\t\t\tcompatible = \"ti,am33xx-pwmss\";\n" "-\t\t\treg = <0x48302000 0x10>;\n" "-\t\t\tti,hwmods = \"epwmss1\";\n" @@ -1459,7 +1453,7 @@ "-\t\t\t\t 0x48302180 0x48302180 0x80 /* EQEP */\n" "-\t\t\t\t 0x48302200 0x48302200 0x80>; /* EHRPWM */\n" "-\n" - "-\t\t\tecap1: ecap@48302100 {\n" + "-\t\t\tecap1: ecap at 48302100 {\n" "-\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "-\t\t\t\t\t \"ti,am33xx-ecap\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1471,7 +1465,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,am3352-ehrpwm\",\n" "-\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1482,7 +1476,7 @@ "-\t\t\t};\n" "-\t\t};\n" "-\n" - "-\t\tepwmss2: epwmss@48304000 {\n" + "-\t\tepwmss2: epwmss at 48304000 {\n" "-\t\t\tcompatible = \"ti,am33xx-pwmss\";\n" "-\t\t\treg = <0x48304000 0x10>;\n" "-\t\t\tti,hwmods = \"epwmss2\";\n" @@ -1493,7 +1487,7 @@ "-\t\t\t\t 0x48304180 0x48304180 0x80 /* EQEP */\n" "-\t\t\t\t 0x48304200 0x48304200 0x80>; /* EHRPWM */\n" "-\n" - "-\t\t\tecap2: ecap@48304100 {\n" + "-\t\t\tecap2: ecap at 48304100 {\n" "-\t\t\t\tcompatible = \"ti,am3352-ecap\",\n" "-\t\t\t\t\t \"ti,am33xx-ecap\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1505,7 +1499,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,am3352-ehrpwm\",\n" "-\t\t\t\t\t \"ti,am33xx-ehrpwm\";\n" "-\t\t\t\t#pwm-cells = <3>;\n" @@ -1516,7 +1510,7 @@ "-\t\t\t};\n" "-\t\t};\n" "-\n" - "-\t\tmac: ethernet@4a100000 {\n" + "-\t\tmac: ethernet at 4a100000 {\n" "-\t\t\tcompatible = \"ti,am335x-cpsw\",\"ti,cpsw\";\n" "-\t\t\tti,hwmods = \"cpgmac0\";\n" "-\t\t\tclocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;\n" @@ -1544,7 +1538,7 @@ "-\t\t\tsyscon = <&scm_conf>;\n" "-\t\t\tstatus = \"disabled\";\n" "-\n" - "-\t\t\tdavinci_mdio: mdio@4a101000 {\n" + "-\t\t\tdavinci_mdio: mdio at 4a101000 {\n" "-\t\t\t\tcompatible = \"ti,cpsw-mdio\",\"ti,davinci_mdio\";\n" "-\t\t\t\t#address-cells = <1>;\n" "-\t\t\t\t#size-cells = <0>;\n" @@ -1554,31 +1548,31 @@ "-\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,am3352-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\tocmcram: ocmcram@40300000 {\n" + " \t\tocmcram: ocmcram at 40300000 {\n" " \t\t\tcompatible = \"mmio-sram\";\n" " \t\t\treg = <0x40300000 0x10000>; /* 64k */\n" "@@ -924,40 +393,6 @@\n" " \t\t\t};\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 = <4>;\n" @@ -1586,7 +1580,7 @@ "-\t\t\tstatus = \"disabled\";\n" "-\t\t};\n" "-\n" - "-\t\tlcdc: lcdc@4830e000 {\n" + "-\t\tlcdc: lcdc at 4830e000 {\n" "-\t\t\tcompatible = \"ti,am33xx-tilcdc\";\n" "-\t\t\treg = <0x4830e000 0x1000>;\n" "-\t\t\tinterrupts = <36>;\n" @@ -1594,7 +1588,7 @@ "-\t\t\tstatus = \"disabled\";\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\tinterrupts = <16>;\n" @@ -1612,7 +1606,7 @@ "-\t\t\t};\n" "-\t\t};\n" "-\n" - " \t\temif: emif@4c000000 {\n" + " \t\temif: emif at 4c000000 {\n" " \t\t\tcompatible = \"ti,emif-am3352\";\n" " \t\t\treg = <0x4c000000 0x1000000>;\n" "@@ -1005,42 +440,8 @@\n" @@ -1620,7 +1614,7 @@ " \t\t\tdma-names = \"tx\", \"rx\";\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" @@ -1634,7 +1628,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" @@ -1648,7 +1642,7 @@ "-\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" @@ -1662,4 +1656,4 @@ "-- \n" 2.19.0 -74404486e4b9349c442f3ec5c17f56e0a6c9a206100329ccaaeda2985ba5b5f0 +0eae5b7c140ed57dc0dda52b492d8c385c976e5eb0fbbb2460e11afe40e0d2a6
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.