ARM: dts: add QorIQ DPAA 1 FMan v3 to LS1046ARDB

[oweals/u-boot.git] / arch / arm / dts / am4372.dtsi

diff --git a/arch/arm/dts/am4372.dtsi b/arch/arm/dts/am4372.dtsi
index ade28c790f4bf6abfbb17de0aaee768e8f324837..6f60a32999a1fab66af183cbe61128f40ba15eb1 100644 (file)
--- a/arch/arm/dts/am4372.dtsi
+++ b/arch/arm/dts/am4372.dtsi
@@ -25,6 +25,7 @@
                serial0 = &uart0;
                ethernet0 = &cpsw_emac0;
                ethernet1 = &cpsw_emac1;
+               spi0 = &qspi;
        };
 
        cpus {
@@ -107,8 +108,6 @@
                                        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>;
@@ -118,8 +117,6 @@
                                scm_conf: scm_conf@0 {
                                        compatible = "syscon";
                                        reg = <0x0 0x800>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
 
                                        scm_clocks: clocks {
                                                #address-cells = <1>;
@@ -152,6 +149,7 @@
                uart0: serial@44e09000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x44e09000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart1";
                };
@@ -159,6 +157,7 @@
                uart1: serial@48022000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x48022000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart2";
                        status = "disabled";
@@ -167,6 +166,7 @@
                uart2: serial@48024000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x48024000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart3";
                        status = "disabled";
@@ -175,6 +175,7 @@
                uart3: serial@481a6000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x481a6000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart4";
                        status = "disabled";
@@ -183,6 +184,7 @@
                uart4: serial@481a8000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x481a8000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart5";
                        status = "disabled";
@@ -191,6 +193,7 @@
                uart5: serial@481aa000 {
                        compatible = "ti,am4372-uart","ti,omap2-uart";
                        reg = <0x481aa000 0x2000>;
+                       reg-shift = <2>;
                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "uart6";
                        status = "disabled";
@@ -540,6 +543,7 @@
                        active_slave = <0>;
                        cpts_clock_mult = <0x80000000>;
                        cpts_clock_shift = <29>;
+                       syscon = <&scm_conf>;
                        ranges;
 
                        davinci_mdio: mdio@4a101000 {
@@ -756,7 +760,8 @@
                        reg = <0x48038000 0x2000>,
                              <0x46000000 0x400000>;
                        reg-names = "mpu", "dat";
-                       interrupts = <80>, <81>;
+                       interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "tx", "rx";
                        status = "disabled";
                        dmas = <&edma 8>,
@@ -770,7 +775,8 @@
                        reg = <0x4803C000 0x2000>,
                              <0x46400000 0x400000>;
                        reg-names = "mpu", "dat";
-                       interrupts = <82>, <83>;
+                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "tx", "rx";
                        status = "disabled";
                        dmas = <&edma 10>,
@@ -799,6 +805,8 @@
                        gpmc,num-waitpins = <2>;
                        #address-cells = <2>;
                        #size-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                        status = "disabled";
                };
 
@@ -902,7 +910,9 @@
 
                qspi: qspi@47900000 {
                        compatible = "ti,am4372-qspi";
-                       reg = <0x47900000 0x100>;
+                       reg = <0x47900000 0x100>,
+                             <0x30000000 0x4000000>;
+                       reg-names = "qspi_base", "qspi_mmap";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        ti,hwmods = "qspi";