diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-01 08:17:39 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-01 08:17:39 +0200 |
| commit | ed2670b334a1050aa122cd9ca53c7a545642c46b (patch) | |
| tree | dc881bb034a0d27194d52cd2b9011e84a6eca3ab /Documentation | |
| parent | Merge tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux into n... (diff) | |
| parent | arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree (diff) | |
| download | linux-ed2670b334a1050aa122cd9ca53c7a545642c46b.tar.xz linux-ed2670b334a1050aa122cd9ca53c7a545642c46b.zip | |
Merge tag 'pcie_kw-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper:
mvebu pcie driver (kirkwood) for v3.11
- kirkwood
- enable pcie driver
- migrate boards over to pcie dt init
depends
- mvebu/pcie
- mvebu/of_pci
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'pcie_kw-3.11' of git://git.infradead.org/users/jcooper/linux:
arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree
arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface
arm: kirkwood: convert ZyXEL NSA310 to use DT for the PCIe interface
arm: kirkwood: convert MPL CEC4 to use DT for the PCIe interface
arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface
arm: kirkwood: add SoC-level Device Tree data for PCIe interfaces
arm: kirkwood: move PCIe window init to legacy driver
pci: mvebu: enable driver usage on Kirkwood
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt index eb69d92c23e1..f8d405897a94 100644 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt @@ -4,6 +4,7 @@ Mandatory properties: - compatible: one of the following values: marvell,armada-370-pcie marvell,armada-xp-pcie + marvell,kirkwood-pcie - #address-cells, set to <3> - #size-cells, set to <2> - #interrupt-cells, set to <1> |