Merge remote-tracking branch 'scsi/for-next'

[karo-tx-linux.git] / Documentation / devicetree / bindings / scsi / hisilicon-sas.txt

diff --git a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
index f67e761bcc18e8f37f5f56e89f7f8e514ab6c2f4..bf2411f366e5a2e4e9309333ffb9e2269236cc60 100644 (file)
--- a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+++ b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
@@ -5,6 +5,7 @@ The HiSilicon SAS controller supports SAS/SATA.
 Main node required properties:
   - compatible : value should be as follows:
        (a) "hisilicon,hip05-sas-v1" for v1 hw in hip05 chipset
+       (b) "hisilicon,hip06-sas-v2" for v2 hw in hip06 chipset
   - sas-addr : array of 8 bytes for host SAS address
   - reg : Address and length of the SAS register
   - hisilicon,sas-syscon: phandle of syscon used for sas control
@@ -13,7 +14,7 @@ Main node required properties:
   - ctrl-clock-ena-reg : offset to controller clock enable register in ctrl reg
   - queue-count : number of delivery and completion queues in the controller
   - phy-count : number of phys accessible by the controller
-  - interrupts : Interrupts for phys, completion queues, and fatal
+  - interrupts : For v1 hw: Interrupts for phys, completion queues, and fatal
                sources; the interrupts are ordered in 3 groups, as follows:
                        - Phy interrupts
                        - Completion queue interrupts
@@ -30,6 +31,24 @@ Main node required properties:
                Fatal interrupts : the fatal interrupts are ordered as follows:
                        - ECC
                        - AXI bus
+               For v2 hw: Interrupts for phys, Sata, and completion queues;
+               the interrupts are ordered in 3 groups, as follows:
+                       - Phy interrupts
+                       - Sata interrupts
+                       - Completion queue interrupts
+               Phy interrupts : Each controller has 2 phy interrupts:
+                       - phy up/down
+                       - channel interrupt
+               Sata interrupts : Each phy on the controller has 1 Sata
+                       interrupt. The interrupts are ordered in increasing
+                       order.
+               Completion queue interrupts : each completion queue has 1
+                       interrupt source. The interrupts are ordered in
+                       increasing order.
+
+Optional main node properties:
+ - hip06-sas-v2-quirk-amt : when set, indicates that the v2 controller has the
+                           "am-max-transmissions" limitation.
 
 Example:
        sas0: sas@c1000000 {