diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 17:50:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 17:50:17 -0500 |
| commit | 794e96e8ecc1eeff56f4ede168fd0b8f4c5a00b9 (patch) | |
| tree | c85a4b2e2efdc8e226ccfd17eb9e8a3693659ef1 /Documentation/devicetree/bindings | |
| parent | c2ac2ae44d4c32382d001672021116e771bef4c9 (diff) | |
| parent | 0f1741c74aa6794b1c7fbdd19f26a4f2377a11c6 (diff) | |
Merge tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
"Following up on last week's discussion, here's my part of the EDAC
pile, highlights in the signed tag.
The last two patches have a date from just now because I've just
applied them to the tree after Johannes sent them to me earlier. I
decided to forward them now because they're trivial.
There's a third one for MPC85xx which adds PCIe error interrupt
support but since it is not so trivial and hasn't seen any linux-next
time, I'm deferring it to 3.14
EDAC update highlights:
- Support for Calxeda ECX-2000 memory controller, from Robert Richter
- Misc Calxeda Highbank drivers and EDAC core cleanups, from Rob
Herring and Robert Richter
- New maintainer for Freescale's MPC85xx EDAC driver: Johannes
Thumshirn"
* tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
edac/85xx: Remove mpc85xx_pci_err_remove
EDAC: Add edac-mpc85xx driver to MAINTAINERS
edac, highbank: Moving error injection to sysfs for edac
edac, highbank: Add MAINTAINERS entry
edac: Unify reporting of device info for device, mc and pci
edac, highbank: Improve and unify naming
edac, highbank: Add Calxeda ECX-2000 support
ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
edac, highbank: Fix interrupt setup of mem and l2 controller
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt index f770ac0893d4..049675944b78 100644 --- a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt +++ b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | Calxeda DDR memory controller | 1 | Calxeda DDR memory controller |
| 2 | 2 | ||
| 3 | Properties: | 3 | Properties: |
| 4 | - compatible : Should be "calxeda,hb-ddr-ctrl" | 4 | - compatible : Should be: |
| 5 | - "calxeda,hb-ddr-ctrl" for ECX-1000 | ||
| 6 | - "calxeda,ecx-2000-ddr-ctrl" for ECX-2000 | ||
| 5 | - reg : Address and size for DDR controller registers. | 7 | - reg : Address and size for DDR controller registers. |
| 6 | - interrupts : Interrupt for DDR controller. | 8 | - interrupts : Interrupt for DDR controller. |
| 7 | 9 | ||