Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

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

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index fabc9f36c4084caab6e88b7bac0f30363bdfe3b5..8833a4c3cd9695a7a6a14159bd0a3ad4578a8e9f 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -91,6 +91,13 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
+               otp: otp@0301c800 {
+                       compatible = "brcm,ocotp";
+                       reg = <0x0301c800 0x2c>;
+                       brcm,ocotp-size = <2048>;
+                       status = "disabled";
+               };
+
                pcie_phy: phy@0301d0a0 {
                        compatible = "brcm,cygnus-pcie-phy";
                        reg = <0x0301d0a0 0x14>;
@@ -108,12 +115,21 @@
                        };
                };
 
-               pinctrl: pinctrl@0x0301d0c8 {
+               pinctrl: pinctrl@0301d0c8 {
                        compatible = "brcm,cygnus-pinmux";
                        reg = <0x0301d0c8 0x30>,
                              <0x0301d24c 0x2c>;
                };
 
+               mailbox: mailbox@03024024 {
+                       compatible = "brcm,iproc-mailbox";
+                       reg = <0x03024024 0x40>;
+                       interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
+                       #interrupt-cells = <1>;
+                       interrupt-controller;
+                       #mbox-cells = <1>;
+               };
+
                gpio_crmu: gpio@03024800 {
                        compatible = "brcm,cygnus-crmu-gpio";
                        reg = <0x03024800 0x50>,
@@ -121,6 +137,9 @@
                        ngpios = <6>;
                        #gpio-cells = <2>;
                        gpio-controller;
+                       interrupt-controller;
+                       interrupt-parent = <&mailbox>;
+                       interrupts = <0>;
                };
 
                i2c0: i2c@18008000 {