Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / broadcom / stingray / stingray.dtsi

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
index a70e8ddbd66f5b836fa5e51e369d7829b0ec0501..e283480bfc7e5d50701b7d62bde1b9b3e53ee5a5 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -146,6 +146,11 @@
                             <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
        };
 
+       mhb: syscon@60401000 {
+               compatible = "brcm,sr-mhb", "syscon";
+               reg = <0 0x60401000 0 0x38c>;
+       };
+
        scr {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -258,6 +263,18 @@
 
                #include "stingray-clock.dtsi"
 
+               otp: otp@1c400 {
+                       compatible = "brcm,ocotp-v2";
+                       reg = <0x0001c400 0x68>;
+                       brcm,ocotp-size = <2048>;
+                       status = "okay";
+               };
+
+               cdru: syscon@1d000 {
+                       compatible = "brcm,sr-cdru", "syscon";
+                       reg = <0x0001d000 0x400>;
+               };
+
                gpio_crmu: gpio@24800 {
                        compatible = "brcm,iproc-gpio";
                        reg = <0x00024800 0x4c>;
@@ -269,6 +286,7 @@
 
        #include "stingray-fs4.dtsi"
        #include "stingray-sata.dtsi"
+       #include "stingray-pcie.dtsi"
 
        hsls {
                compatible = "simple-bus";
@@ -420,6 +438,7 @@
                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&hsls_25m_div2_clk>, <&hsls_div4_clk>;
                        clock-names = "wdogclk", "apb_pclk";
+                       timeout-sec = <60>;
                };
 
                gpio_hsls: gpio@d0000 {