diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 16:09:35 -0600 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-06-02 19:07:50 +0200 |
| commit | 451bb7fbccdc0f5d942227913afa5dea3afd12f7 (patch) | |
| tree | 0e47457317b2c99328f1eb94c2f1b87c4c9fbadd /Documentation/devicetree/bindings/edac | |
| parent | 2ce39109a5062b06df440fbf2993ce9ab3bf6e08 (diff) | |
EDAC, xgene: Fix cpuid abuse
The new x-gene EDAC driver incorrectly tried to figure out the version
of one of its IP blocks by looking at the version of the CPU core, which
is only vagely related.
This removes the incorrect code and instead uses the version of the IP
block in the compatible string where it belongs.
Found using build testing on x86, which does not provide the arm64
cpuid interface.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[ Changed subnode to "apm,xgene-edac-pmd-v2", adjusted check. ]
Signed-off-by: Loc Ho <lho@apm.com>
Cc: devicetree@vger.kernel.org
Cc: dougthompson@xmission.com
Cc: ijc+devicetree@hellion.org.uk
Cc: jcm@redhat.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: mark.rutland@arm.com
Cc: mchehab@osg.samsung.com
Cc: patches@apm.com
Cc: robh+dt@kernel.org
Link: http://lkml.kernel.org/r/3195065.IK73o60xya@wuerfel
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'Documentation/devicetree/bindings/edac')
| -rw-r--r-- | Documentation/devicetree/bindings/edac/apm-xgene-edac.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt index 480911c38ff9..78edb80002c8 100644 --- a/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt +++ b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt @@ -25,7 +25,8 @@ Required properties for memory controller subnode: - memory-controller : Instance number of the memory controller. Required properties for PMD subnode: -- compatible : Shall be "apm,xgene-edac-pmd". +- compatible : Shall be "apm,xgene-edac-pmd" or + "apm,xgene-edac-pmd-v2". - reg : First resource shall be the PMD resource. - pmd-controller : Instance number of the PMD controller. |