86,99d85
< am33xx_control_module: control_module@4a002000 {
< compatible = "syscon";
< reg = <0x44e10000 0x7fc>;
< };
<
< am33xx_pinmux: pinmux@44e10800 {
< compatible = "pinctrl-single";
< reg = <0x44e10800 0x0238>;
< #address-cells = <1>;
< #size-cells = <0>;
< pinctrl-single,register-width = <32>;
< pinctrl-single,function-mask = <0x7f>;
< };
<
114,116c100,104
< prcm: prcm@44e00000 {
< compatible = "ti,am3-prcm";
< reg = <0x44e00000 0x4000>;
---
> l4_wkup: l4_wkup@44c00000 {
> compatible = "ti,am3-l4-wkup", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x44c00000 0x280000>;
118,120c106,112
< prcm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> wkup_m3: wkup_m3@100000 {
> compatible = "ti,am3352-wkup-m3";
> reg = <0x100000 0x4000>,
> <0x180000 0x2000>;
> reg-names = "umem", "dmem";
> ti,hwmods = "wkup_m3";
> ti,pm-firmware = "am335x-pm-firmware.elf";
123,125c115,117
< prcm_clockdomains: clockdomains {
< };
< };
---
> prcm: prcm@200000 {
> compatible = "ti,am3-prcm";
> reg = <0x200000 0x4000>;
127,129c119,122
< scrm: scrm@44e10000 {
< compatible = "ti,am3-scrm";
< reg = <0x44e10000 0x2000>;
---
> prcm_clocks: clocks {
> #address-cells = <1>;
> #size-cells = <0>;
> };
131,133c124,125
< scrm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> prcm_clockdomains: clockdomains {
> };
136c128,173
< scrm_clockdomains: clockdomains {
---
> scm: scm@210000 {
> compatible = "ti,am3-scm", "simple-bus";
> reg = <0x210000 0x2000>;
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x210000 0x2000>;
>
> am33xx_pinmux: pinmux@800 {
> compatible = "pinctrl-single";
> reg = <0x800 0x238>;
> #address-cells = <1>;
> #size-cells = <0>;
> pinctrl-single,register-width = <32>;
> pinctrl-single,function-mask = <0x7f>;
> };
>
> scm_conf: scm_conf@0 {
> compatible = "syscon";
> reg = <0x0 0x800>;
> #address-cells = <1>;
> #size-cells = <1>;
>
> scm_clocks: clocks {
> #address-cells = <1>;
> #size-cells = <0>;
> };
> };
>
> wkup_m3_ipc: wkup_m3_ipc@1324 {
> compatible = "ti,am3352-wkup-m3-ipc";
> reg = <0x1324 0x24>;
> interrupts = <78>;
> ti,rproc = <&wkup_m3>;
> mboxes = <&mailbox &mbox_wkupm3>;
> };
>
> edma_xbar: dma-router@f90 {
> compatible = "ti,am335x-edma-crossbar";
> reg = <0xf90 0x40>;
> #dma-cells = <3>;
> dma-requests = <32>;
> dma-masters = <&edma>;
> };
>
> scm_clockdomains: clockdomains {
> };
140,144d176
< cm: syscon@44e10000 {
< compatible = "ti,am33xx-controlmodule", "syscon";
< reg = <0x44e10000 0x800>;
< };
<
153,156c185,188
< compatible = "ti,edma3";
< ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
< reg = <0x49000000 0x10000>,
< <0x44e10f90 0x40>;
---
> compatible = "ti,edma3-tpcc";
> ti,hwmods = "tpcc";
> reg = <0x49000000 0x10000>;
> reg-names = "edma3_cc";
158c190,198
< #dma-cells = <1>;
---
> interrupt-names = "edma3_ccint", "emda3_mperr",
> "edma3_ccerrint";
> dma-requests = <64>;
> #dma-cells = <2>;
>
> ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
> <&edma_tptc2 0>;
>
> ti,edma-memcpy-channels = <20 21>;
160a201,224
> edma_tptc0: tptc@49800000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc0";
> reg = <0x49800000 0x100000>;
> interrupts = <112>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc1: tptc@49900000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc1";
> reg = <0x49900000 0x100000>;
> interrupts = <113>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc2: tptc@49a00000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc2";
> reg = <0x49a00000 0x100000>;
> interrupts = <114>;
> interrupt-names = "edma3_tcerrint";
> };
>
206c270
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
212c276
< dmas = <&edma 26>, <&edma 27>;
---
> dmas = <&edma 26 0>, <&edma 27 0>;
217c281
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
223c287
< dmas = <&edma 28>, <&edma 29>;
---
> dmas = <&edma 28 0>, <&edma 29 0>;
228c292
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
234c298
< dmas = <&edma 30>, <&edma 31>;
---
> dmas = <&edma 30 0>, <&edma 31 0>;
239c303
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
248c312
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
257c321
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
301,302c365,366
< dmas = <&edma 24
< &edma 25>;
---
> dmas = <&edma_xbar 24 0 0
> &edma_xbar 25 0 0>;
314,315c378,379
< dmas = <&edma 2
< &edma 3>;
---
> dmas = <&edma 2 0
> &edma 3 0>;
353c417
< syscon-raminit = <&am33xx_control_module 0x644 0>;
---
> syscon-raminit = <&scm_conf 0x644 0>;
364c428
< syscon-raminit = <&am33xx_control_module 0x644 1>;
---
> syscon-raminit = <&scm_conf 0x644 1>;
453,456c517,520
< dmas = <&edma 16
< &edma 17
< &edma 18
< &edma 19>;
---
> dmas = <&edma 16 0
> &edma 17 0
> &edma 18 0
> &edma 19 0>;
469,472c533,536
< dmas = <&edma 42
< &edma 43
< &edma 44
< &edma 45>;
---
> dmas = <&edma 42 0
> &edma 43 0
> &edma 44 0
> &edma 45 0>;
696c760
< compatible = "ti,cpsw";
---
> compatible = "ti,am335x-cpsw","ti,cpsw";
723c787
< syscon = <&cm>;
---
> syscon = <&scm_conf>;
758,765d821
< wkup_m3: wkup_m3@44d00000 {
< compatible = "ti,am3353-wkup-m3";
< reg = <0x44d00000 0x4000 /* M3 UMEM */
< 0x44d80000 0x2000>; /* M3 DMEM */
< ti,hwmods = "wkup_m3";
< ti,no-reset-on-init;
< };
<
805a862,863
> dmas = <&edma 52>;
> dma-names = "rxtx";
818c876
< dmas = <&edma 36>;
---
> dmas = <&edma 36 0>;
827,828c885,886
< dmas = <&edma 6>,
< <&edma 5>;
---
> dmas = <&edma 6 0>,
> <&edma 5 0>;
841,842c899,900
< dmas = <&edma 8>,
< <&edma 9>;
---
> dmas = <&edma 8 2>,
> <&edma 9 2>;
855,856c913,914
< dmas = <&edma 10>,
< <&edma 11>;
---
> dmas = <&edma 10 2>,
> <&edma 11 2>;
< am33xx_control_module: control_module@4a002000 {
< compatible = "syscon";
< reg = <0x44e10000 0x7fc>;
< };
<
< am33xx_pinmux: pinmux@44e10800 {
< compatible = "pinctrl-single";
< reg = <0x44e10800 0x0238>;
< #address-cells = <1>;
< #size-cells = <0>;
< pinctrl-single,register-width = <32>;
< pinctrl-single,function-mask = <0x7f>;
< };
<
114,116c100,104
< prcm: prcm@44e00000 {
< compatible = "ti,am3-prcm";
< reg = <0x44e00000 0x4000>;
---
> l4_wkup: l4_wkup@44c00000 {
> compatible = "ti,am3-l4-wkup", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x44c00000 0x280000>;
118,120c106,112
< prcm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> wkup_m3: wkup_m3@100000 {
> compatible = "ti,am3352-wkup-m3";
> reg = <0x100000 0x4000>,
> <0x180000 0x2000>;
> reg-names = "umem", "dmem";
> ti,hwmods = "wkup_m3";
> ti,pm-firmware = "am335x-pm-firmware.elf";
123,125c115,117
< prcm_clockdomains: clockdomains {
< };
< };
---
> prcm: prcm@200000 {
> compatible = "ti,am3-prcm";
> reg = <0x200000 0x4000>;
127,129c119,122
< scrm: scrm@44e10000 {
< compatible = "ti,am3-scrm";
< reg = <0x44e10000 0x2000>;
---
> prcm_clocks: clocks {
> #address-cells = <1>;
> #size-cells = <0>;
> };
131,133c124,125
< scrm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> prcm_clockdomains: clockdomains {
> };
136c128,173
< scrm_clockdomains: clockdomains {
---
> scm: scm@210000 {
> compatible = "ti,am3-scm", "simple-bus";
> reg = <0x210000 0x2000>;
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x210000 0x2000>;
>
> am33xx_pinmux: pinmux@800 {
> compatible = "pinctrl-single";
> reg = <0x800 0x238>;
> #address-cells = <1>;
> #size-cells = <0>;
> pinctrl-single,register-width = <32>;
> pinctrl-single,function-mask = <0x7f>;
> };
>
> scm_conf: scm_conf@0 {
> compatible = "syscon";
> reg = <0x0 0x800>;
> #address-cells = <1>;
> #size-cells = <1>;
>
> scm_clocks: clocks {
> #address-cells = <1>;
> #size-cells = <0>;
> };
> };
>
> wkup_m3_ipc: wkup_m3_ipc@1324 {
> compatible = "ti,am3352-wkup-m3-ipc";
> reg = <0x1324 0x24>;
> interrupts = <78>;
> ti,rproc = <&wkup_m3>;
> mboxes = <&mailbox &mbox_wkupm3>;
> };
>
> edma_xbar: dma-router@f90 {
> compatible = "ti,am335x-edma-crossbar";
> reg = <0xf90 0x40>;
> #dma-cells = <3>;
> dma-requests = <32>;
> dma-masters = <&edma>;
> };
>
> scm_clockdomains: clockdomains {
> };
140,144d176
< cm: syscon@44e10000 {
< compatible = "ti,am33xx-controlmodule", "syscon";
< reg = <0x44e10000 0x800>;
< };
<
153,156c185,188
< compatible = "ti,edma3";
< ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
< reg = <0x49000000 0x10000>,
< <0x44e10f90 0x40>;
---
> compatible = "ti,edma3-tpcc";
> ti,hwmods = "tpcc";
> reg = <0x49000000 0x10000>;
> reg-names = "edma3_cc";
158c190,198
< #dma-cells = <1>;
---
> interrupt-names = "edma3_ccint", "emda3_mperr",
> "edma3_ccerrint";
> dma-requests = <64>;
> #dma-cells = <2>;
>
> ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
> <&edma_tptc2 0>;
>
> ti,edma-memcpy-channels = <20 21>;
160a201,224
> edma_tptc0: tptc@49800000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc0";
> reg = <0x49800000 0x100000>;
> interrupts = <112>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc1: tptc@49900000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc1";
> reg = <0x49900000 0x100000>;
> interrupts = <113>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc2: tptc@49a00000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc2";
> reg = <0x49a00000 0x100000>;
> interrupts = <114>;
> interrupt-names = "edma3_tcerrint";
> };
>
206c270
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
212c276
< dmas = <&edma 26>, <&edma 27>;
---
> dmas = <&edma 26 0>, <&edma 27 0>;
217c281
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
223c287
< dmas = <&edma 28>, <&edma 29>;
---
> dmas = <&edma 28 0>, <&edma 29 0>;
228c292
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
234c298
< dmas = <&edma 30>, <&edma 31>;
---
> dmas = <&edma 30 0>, <&edma 31 0>;
239c303
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
248c312
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
257c321
< compatible = "ti,omap3-uart";
---
> compatible = "ti,am3352-uart", "ti,omap3-uart";
301,302c365,366
< dmas = <&edma 24
< &edma 25>;
---
> dmas = <&edma_xbar 24 0 0
> &edma_xbar 25 0 0>;
314,315c378,379
< dmas = <&edma 2
< &edma 3>;
---
> dmas = <&edma 2 0
> &edma 3 0>;
353c417
< syscon-raminit = <&am33xx_control_module 0x644 0>;
---
> syscon-raminit = <&scm_conf 0x644 0>;
364c428
< syscon-raminit = <&am33xx_control_module 0x644 1>;
---
> syscon-raminit = <&scm_conf 0x644 1>;
453,456c517,520
< dmas = <&edma 16
< &edma 17
< &edma 18
< &edma 19>;
---
> dmas = <&edma 16 0
> &edma 17 0
> &edma 18 0
> &edma 19 0>;
469,472c533,536
< dmas = <&edma 42
< &edma 43
< &edma 44
< &edma 45>;
---
> dmas = <&edma 42 0
> &edma 43 0
> &edma 44 0
> &edma 45 0>;
696c760
< compatible = "ti,cpsw";
---
> compatible = "ti,am335x-cpsw","ti,cpsw";
723c787
< syscon = <&cm>;
---
> syscon = <&scm_conf>;
758,765d821
< wkup_m3: wkup_m3@44d00000 {
< compatible = "ti,am3353-wkup-m3";
< reg = <0x44d00000 0x4000 /* M3 UMEM */
< 0x44d80000 0x2000>; /* M3 DMEM */
< ti,hwmods = "wkup_m3";
< ti,no-reset-on-init;
< };
<
805a862,863
> dmas = <&edma 52>;
> dma-names = "rxtx";
818c876
< dmas = <&edma 36>;
---
> dmas = <&edma 36 0>;
827,828c885,886
< dmas = <&edma 6>,
< <&edma 5>;
---
> dmas = <&edma 6 0>,
> <&edma 5 0>;
841,842c899,900
< dmas = <&edma 8>,
< <&edma 9>;
---
> dmas = <&edma 8 2>,
> <&edma 9 2>;
855,856c913,914
< dmas = <&edma 10>,
< <&edma 11>;
---
> dmas = <&edma 10 2>,
> <&edma 11 2>;