diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 12:56:14 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 12:56:14 -0800 |
| commit | 2ea698c63559e3a70f345b0060622a4169f2ed64 (patch) | |
| tree | b1dcfad5fb07750d23ffdbcbfa5acb18549158bb /Documentation | |
| parent | 0d639e0a65af84a2cf636f1aaa7775131931356f (diff) | |
| parent | 8b44f5be20fd531054e546b662f46e619bff2e72 (diff) | |
| download | linux-stable-2ea698c63559e3a70f345b0060622a4169f2ed64.tar.gz linux-stable-2ea698c63559e3a70f345b0060622a4169f2ed64.tar.bz2 linux-stable-2ea698c63559e3a70f345b0060622a4169f2ed64.zip | |
Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.5 (part 3)
Add dts for the following boards:
- Zyxel NSA325
- PogoPlug series 4
Add GPU support for Dove
Update boolean property to wakeup source for isil
* tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property
ARM: dts: enable GPU for SolidRun's Cubox
ARM: dts: dove: add DT GPU support
ARM: mvebu: kirkwood: add PogoPlug series 4 device tree
ARM: mvebu: add kirkwood compatibles for cloudengine boards
ARM: dts: kirkwood: Add DTS for Zyxel NSA325
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -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 5171ad8f48ff..ab0c9cdf388e 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -24,6 +24,8 @@ board. Currently known boards are: "buffalo,lswxl" "buffalo,lsxhl" "buffalo,lsxl" +"cloudengines,pogo02" +"cloudengines,pogoplugv4" "dlink,dns-320" "dlink,dns-320-a1" "dlink,dns-325" |