OSDN Git Service

Documentation/bindings: net: marvell-pp2: update the IRQs description
authorAntoine Tenart <antoine.tenart@bootlin.com>
Wed, 19 Sep 2018 09:27:02 +0000 (11:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Sep 2018 04:09:53 +0000 (21:09 -0700)
This patch updates the interrupts part of the Marvell PPv2 driver
bindings documentation, to keep it in sync with the driver.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Documentation/devicetree/bindings/net/marvell-pp2.txt

index fc019df..b783976 100644 (file)
@@ -31,7 +31,7 @@ required.
 
 Required properties (port):
 
-- interrupts: interrupt for the port
+- interrupts: interrupt(s) for the port
 - port-id: ID of the port from the MAC point of view
 - gop-port-id: only for marvell,armada-7k-pp2, ID of the port from the
   GOP (Group Of Ports) point of view. This ID is used to index the
@@ -43,10 +43,12 @@ Optional properties (port):
 - marvell,loopback: port is loopback mode
 - phy: a phandle to a phy node defining the PHY address (as the reg
   property, a single integer).
-- interrupt-names: if more than a single interrupt for rx is given, must
-                   be the name associated to the interrupts listed. Valid
-                   names are: "tx-cpu0", "tx-cpu1", "tx-cpu2", "tx-cpu3",
-                  "rx-shared", "link".
+- interrupt-names: if more than a single interrupt for is given, must be the
+                   name associated to the interrupts listed. Valid names are:
+                   "hifX", with X in [0..8], and "link". The names "tx-cpu0",
+                   "tx-cpu1", "tx-cpu2", "tx-cpu3" and "rx-shared" are supported
+                   for backward compatibility but shouldn't be used for new
+                   additions.
 - marvell,system-controller: a phandle to the system controller.
 
 Example for marvell,armada-375-pp2:
@@ -89,9 +91,14 @@ cpm_ethernet: ethernet@0 {
                             <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
-                            <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-                                 "tx-cpu3", "rx-shared";
+                            <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 59 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 63 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 67 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 71 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4",
+                                 "hif5", "hif6", "hif7", "hif8", "link";
                port-id = <0>;
                gop-port-id = <0>;
        };
@@ -101,9 +108,14 @@ cpm_ethernet: ethernet@0 {
                             <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
-                            <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-                                 "tx-cpu3", "rx-shared";
+                            <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 60 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 64 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 68 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 72 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4",
+                                 "hif5", "hif6", "hif7", "hif8", "link";
                port-id = <1>;
                gop-port-id = <2>;
        };
@@ -113,9 +125,14 @@ cpm_ethernet: ethernet@0 {
                             <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
                             <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
-                            <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-                                 "tx-cpu3", "rx-shared";
+                            <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 61 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 65 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 69 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 73 IRQ_TYPE_LEVEL_HIGH>,
+                            <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4",
+                                 "hif5", "hif6", "hif7", "hif8", "link";
                port-id = <2>;
                gop-port-id = <3>;
        };