Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm-nsp.dtsi

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 832795b0fd0ff8ad167433af83688813c2952341..fe6cba994a97df53b42cb7bef77e89cf18d280c9 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -245,6 +245,15 @@
                        status = "disabled";
                };
 
+               mailbox: mailbox@25000 {
+                       compatible = "brcm,iproc-fa2-mbox";
+                       reg = <0x25000 0x445>;
+                       interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+
                nand: nand@26000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x026000 0x600>,
@@ -288,6 +297,12 @@
                        #size-cells = <0>;
                };
 
+               crypto@2f000 {
+                       compatible = "brcm,spum-nsp-crypto";
+                       reg = <0x2f000 0x900>;
+                       mboxes = <&mailbox 0>;
+               };
+
                gpiob: gpio@30000 {
                        compatible = "brcm,iproc-nsp-gpio", "brcm,iproc-gpio";
                        reg = <0x30000 0x50>;
@@ -306,6 +321,20 @@
                        status = "disabled";
                };
 
+               ehci0: usb@2a000 {
+                       compatible = "generic-ehci";
+                       reg = <0x2a000 0x100>;
+                       interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               ohci0: usb@2b000 {
+                       compatible = "generic-ohci";
+                       reg = <0x2b000 0x100>;
+                       interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
                rng: rng@33000 {
                        compatible = "brcm,bcm-nsp-rng";
                        reg = <0x33000 0x14>;
@@ -347,6 +376,7 @@
                        #size-cells = <0>;
                        interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
                        clock-frequency = <100000>;
+                       status = "disabled";
                };
 
                watchdog@39000 {
@@ -450,7 +480,7 @@
                status = "disabled";
 
                msi-parent = <&msi0>;
-               msi0: msi@18012000 {
+               msi0: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;
@@ -486,7 +516,7 @@
                status = "disabled";
 
                msi-parent = <&msi1>;
-               msi1: msi@18013000 {
+               msi1: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;
@@ -522,7 +552,7 @@
                status = "disabled";
 
                msi-parent = <&msi2>;
-               msi2: msi@18014000 {
+               msi2: msi-controller {
                        compatible = "brcm,iproc-msi";
                        msi-controller;
                        interrupt-parent = <&gic>;