Merge branch 'topic/livepatch' of git://git.kernel.org/pub/scm/linux/kernel/git/power...

[deliverable/linux.git] / Documentation / devicetree / bindings / edac / apm-xgene-edac.txt

diff --git a/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
index 78e2a31c58d0735b40254e592e1fa7c73983d571..1006b04894642685a984081121c4b9229181a55c 100644 (file)
--- a/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
+++ b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
@@ -16,6 +16,10 @@ Required properties:
 - regmap-mcba          : Regmap of the MCB-A (memory bridge) resource.
 - regmap-mcbb          : Regmap of the MCB-B (memory bridge) resource.
 - regmap-efuse         : Regmap of the PMD efuse resource.
+- regmap-rb            : Regmap of the register bus resource. This property
+                         is optional only for compatibility. If the RB
+                         error conditions are not cleared, it will
+                         continuously generate interrupt.
 - reg                  : First resource shall be the CPU bus (PCP) resource.
 - interrupts            : Interrupt-specifier for MCU, PMD, L3, or SoC error
                          IRQ(s).
@@ -64,6 +68,11 @@ Example:
                reg = <0x0 0x1054a000 0x0 0x20>;
        };
 
+       rb: rb@7e000000 {
+               compatible = "apm,xgene-rb", "syscon";
+               reg = <0x0 0x7e000000 0x0 0x10>;
+       };
+
        edac@78800000 {
                compatible = "apm,xgene-edac";
                #address-cells = <2>;
@@ -73,6 +82,7 @@ Example:
                regmap-mcba = <&mcba>;
                regmap-mcbb = <&mcbb>;
                regmap-efuse = <&efuse>;
+               regmap-rb = <&rb>;
                reg = <0x0 0x78800000 0x0 0x100>;
                interrupts = <0x0 0x20 0x4>,
                             <0x0 0x21 0x4>,