diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-17 19:08:17 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-17 19:08:17 +0200 |
| commit | 858ed8cbb3010be5240f18719231dd625cfd549d (patch) | |
| tree | 20ea00cba695b7e2b28213c76824249ba7e2ea02 /Documentation/devicetree | |
| parent | Merge branch 'lpc18xx_43xx_dts_4.3' of https://github.com/manabian/linux-lpc ... (diff) | |
| parent | ARM: mvebu: update EEPROM description of Armada 388 GP (diff) | |
| download | linux-858ed8cbb3010be5240f18719231dd625cfd549d.tar.xz linux-858ed8cbb3010be5240f18719231dd625cfd549d.zip | |
Merge tag 'mvebu-dt-4.3-1' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: dt changes for v4.3" from Gregory Clement:
mvebu dt changes for v4.3 (part #1)
- Update Armada 388 GP description
- Add Buffalo Linkstation LS-WXL and LS-WSXL
- Fine-tune the L2 configuration for cortex A9 based SoC
- Update XOR definition for Armada 38x and 39x SoC
* tag 'mvebu-dt-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update EEPROM description of Armada 388 GP
ARM: mvebu: fix description of pwr-sata0 regulator on Armada 388 GP
ARM: dts: add buffalo linkstation ls-wvl/vl
ARM: dts: add buffalo linkstation ls-wxl/wsxl
ARM: mvebu: use DT properties to fine-tune the L2 configuration
ARM: mvebu: use armada-380-xor on Armada 38x and 39x
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/marvell,kirkwood.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index 4f40ff3fee4b..5171ad8f48ff 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -20,6 +20,8 @@ And in addition, the compatible shall be extended with the specific board. Currently known boards are: "buffalo,lschlv2" +"buffalo,lswvl" +"buffalo,lswxl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" |