Deleted Added
full compact
18c18
< interrupt-parent = <&gic>;
---
> interrupt-parent = <&wakeupgen>;
25a26,30
> serial1 = &uart1;
> serial2 = &uart2;
> serial3 = &uart3;
> serial4 = &uart4;
> serial5 = &uart5;
27a33
> spi0 = &qspi;
50a57
> interrupt-parent = <&gic>;
52a60,88
> wakeupgen: interrupt-controller@48281000 {
> compatible = "ti,omap4-wugen-mpu";
> interrupt-controller;
> #interrupt-cells = <3>;
> reg = <0x48281000 0x1000>;
> interrupt-parent = <&gic>;
> };
>
> scu: scu@48240000 {
> compatible = "arm,cortex-a9-scu";
> reg = <0x48240000 0x100>;
> };
>
> global_timer: timer@48240200 {
> compatible = "arm,cortex-a9-global-timer";
> reg = <0x48240200 0x100>;
> interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-parent = <&gic>;
> clocks = <&mpu_periphclk>;
> };
>
> local_timer: timer@48240600 {
> compatible = "arm,cortex-a9-twd-timer";
> reg = <0x48240600 0x100>;
> interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-parent = <&gic>;
> clocks = <&mpu_periphclk>;
> };
>
60,75d95
< am43xx_control_module: control_module@4a002000 {
< compatible = "syscon";
< reg = <0x44e10000 0x7f4>;
< };
<
< am43xx_pinmux: pinmux@44e10800 {
< compatible = "ti,am437-padconf", "pinctrl-single";
< reg = <0x44e10800 0x31c>;
< #address-cells = <1>;
< #size-cells = <0>;
< #interrupt-cells = <1>;
< interrupt-controller;
< pinctrl-single,register-width = <32>;
< pinctrl-single,function-mask = <0xffffffff>;
< };
<
87,89c107,111
< prcm: prcm@44df0000 {
< compatible = "ti,am4-prcm";
< reg = <0x44df0000 0x11000>;
---
> l4_wkup: l4_wkup@44c00000 {
> compatible = "ti,am4-l4-wkup", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x44c00000 0x287000>;
91,93c113,119
< prcm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> wkup_m3: wkup_m3@100000 {
> compatible = "ti,am4372-wkup-m3";
> reg = <0x100000 0x4000>,
> <0x180000 0x2000>;
> reg-names = "umem", "dmem";
> ti,hwmods = "wkup_m3";
> ti,pm-firmware = "am335x-pm-firmware.elf";
96,98c122,125
< prcm_clockdomains: clockdomains {
< };
< };
---
> prcm: prcm@1f0000 {
> compatible = "ti,am4-prcm";
> reg = <0x1f0000 0x11000>;
> interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
100,102c127,130
< scrm: scrm@44e10000 {
< compatible = "ti,am4-scrm";
< reg = <0x44e10000 0x2000>;
---
> prcm_clocks: clocks {
> #address-cells = <1>;
> #size-cells = <0>;
> };
104,106c132,133
< scrm_clocks: clocks {
< #address-cells = <1>;
< #size-cells = <0>;
---
> prcm_clockdomains: clockdomains {
> };
109c136,184
< scrm_clockdomains: clockdomains {
---
> scm: scm@210000 {
> compatible = "ti,am4-scm", "simple-bus";
> reg = <0x210000 0x4000>;
> #address-cells = <1>;
> #size-cells = <1>;
> ranges = <0 0x210000 0x4000>;
>
> am43xx_pinmux: pinmux@800 {
> compatible = "ti,am437-padconf",
> "pinctrl-single";
> reg = <0x800 0x31c>;
> #address-cells = <1>;
> #size-cells = <0>;
> #interrupt-cells = <1>;
> interrupt-controller;
> pinctrl-single,register-width = <32>;
> pinctrl-single,function-mask = <0xffffffff>;
> };
>
> 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,am4372-wkup-m3-ipc";
> reg = <0x1324 0x44>;
> interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
> 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 = <64>;
> dma-masters = <&edma>;
> };
>
> scm_clockdomains: clockdomains {
> };
112a188,193
> emif: emif@4c000000 {
> compatible = "ti,emif-am4372";
> reg = <0x4c000000 0x1000000>;
> ti,hwmods = "emif";
> };
>
114,117c195,198
< compatible = "ti,edma3";
< ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
< reg = <0x49000000 0x10000>,
< <0x44e10f90 0x10>;
---
> compatible = "ti,edma3-tpcc";
> ti,hwmods = "tpcc";
> reg = <0x49000000 0x10000>;
> reg-names = "edma3_cc";
119,121c200,210
< <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
< <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
< #dma-cells = <1>;
---
> <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
> 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 = <32 33>;
123a213,236
> edma_tptc0: tptc@49800000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc0";
> reg = <0x49800000 0x100000>;
> interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc1: tptc@49900000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc1";
> reg = <0x49900000 0x100000>;
> interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "edma3_tcerrint";
> };
>
> edma_tptc2: tptc@49a00000 {
> compatible = "ti,edma3-tptc";
> ti,hwmods = "tptc2";
> reg = <0x49a00000 0x100000>;
> interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "edma3_tcerrint";
> };
>
283c396,397
< compatible = "ti,am4372-rtc","ti,da830-rtc";
---
> compatible = "ti,am4372-rtc", "ti,am3352-rtc",
> "ti,da830-rtc";
287a402,403
> clocks = <&clk_32768_ck>;
> clock-names = "int-clk";
423,424c539,540
< dmas = <&edma 24
< &edma 25>;
---
> dmas = <&edma 24 0>,
> <&edma 25 0>;
435,436c551,552
< dmas = <&edma 2
< &edma 3>;
---
> dmas = <&edma 2 0>,
> <&edma 3 0>;
502,503c618,622
< clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;
< clock-names = "fck", "cpts";
---
> clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>,
> <&dpll_clksel_mac_clk>;
> clock-names = "fck", "cpts", "50mclk";
> assigned-clocks = <&dpll_clksel_mac_clk>;
> assigned-clock-rates = <50000000>;
515a635
> syscon = <&scm_conf>;
700c820
< dmas = <&edma 36>;
---
> dmas = <&edma 36 0>;
710,711c830,831
< dmas = <&edma 6
< &edma 5>;
---
> dmas = <&edma 6 0>,
> <&edma 5 0>;
720,721c840,841
< dmas = <&edma 34
< &edma 33>;
---
> dmas = <&edma 34 0>,
> <&edma 33 0>;
734,735c854,855
< dmas = <&edma 8>,
< <&edma 9>;
---
> dmas = <&edma 8 2>,
> <&edma 9 2>;
748,749c868,869
< dmas = <&edma 10>,
< <&edma 11>;
---
> dmas = <&edma 10 2>,
> <&edma 11 2>;
765a886,887
> dmas = <&edma 52>;
> dma-names = "rxtx";
790c912
< compatible = "ti,omap-ocp2scp";
---
> compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
809c931
< compatible = "ti,omap-ocp2scp";
---
> compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
840c962,967
< interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
---
> interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "peripheral",
> "host",
> "otg";
864c991,996
< interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
---
> interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "peripheral",
> "host",
> "otg";
877c1009,1011
< reg = <0x47900000 0x100>;
---
> reg = <0x47900000 0x100>,
> <0x30000000 0x4000000>;
> reg-names = "qspi_base", "qspi_mmap";
887c1021
< compatible = "ti,am43xx-hdq";
---
> compatible = "ti,am4372-hdq";
921a1056
> status = "disabled";
936c1071
< syscon-raminit = <&am43xx_control_module 0x644 0>;
---
> syscon-raminit = <&scm_conf 0x644 0>;
947c1082
< syscon-raminit = <&am43xx_control_module 0x644 1>;
---
> syscon-raminit = <&scm_conf 0x644 1>;