Merge branch 'clk-fixes' into clk-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / bcm7445.dtsi

diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi
index 39ac7840d7eebfafd5be58dc2b3fa5c5b9d6c63b..58dcd666257c001bf33bdded1bcd93f6287332ea 100644 (file)
--- a/arch/arm/boot/dts/bcm7445.dtsi
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -108,6 +108,65 @@
                        brcm,int-map-mask = <0x25c>, <0x7000000>;
                        brcm,int-fwd-mask = <0x70000>;
                };
+
+               hif_intr2_intc: interrupt-controller@3e1000 {
+                       compatible = "brcm,l2-intc";
+                       reg = <0x3e1000 0x30>;
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       interrupts = <GIC_SPI 0x20 0x0>;
+                       interrupt-parent = <&gic>;
+                       interrupt-names = "hif";
+               };
+
+               nand: nand@3e2800 {
+                       status = "disabled";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "brcm,brcmnand-v7.1", "brcm,brcmnand";
+                       reg-names = "nand", "flash-dma";
+                       reg = <0x3e2800 0x600>, <0x3e3000 0x2c>;
+                       interrupt-parent = <&hif_intr2_intc>;
+                       interrupts = <24>, <4>;
+                       interrupt-names = "nand_ctlrdy", "flash_dma_done";
+               };
+
+               sata@45a000 {
+                       compatible = "brcm,bcm7445-ahci", "brcm,sata3-ahci";
+                       reg-names = "ahci", "top-ctrl";
+                       reg = <0x45a000 0xa9c>, <0x458040 0x24>;
+                       interrupts = <GIC_SPI 30 0>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       sata0: sata-port@0 {
+                               reg = <0>;
+                               phys = <&sata_phy0>;
+                       };
+
+                       sata1: sata-port@1 {
+                               reg = <1>;
+                               phys = <&sata_phy1>;
+                       };
+               };
+
+               sata_phy: sata-phy@458100 {
+                       compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";
+                       reg = <0x458100 0x1f00>;
+                       reg-names = "phy";
+                       #address-cells = <0x1>;
+                       #size-cells = <0x0>;
+
+                       sata_phy0: sata-phy@0 {
+                               reg = <0>;
+                               #phy-cells = <0>;
+                       };
+
+                       sata_phy1: sata-phy@1 {
+                               reg = <1>;
+                               #phy-cells = <0>;
+                       };
+               };
        };
 
        smpboot {