diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:22:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:22:41 +0200 |
| commit | cf828ecc706463022b08ef1b87cda25d7d567199 (patch) | |
| tree | e50be7b58a3932bac0f2f939a03b7179fe707cd8 /Documentation | |
| parent | Merge tag 'gemini-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt (diff) | |
| parent | ARM: dts: armada-38x: Add arm_global_timer node (diff) | |
| download | linux-dev-cf828ecc706463022b08ef1b87cda25d7d567199.tar.xz linux-dev-cf828ecc706463022b08ef1b87cda25d7d567199.zip | |
Merge tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.14 (part 1)" from Gregory CLEMENT:
Add arm_global_timer node on Armada 38x
Fix PCI bus dtc warnings on mvebu 32 bits device tree files
* tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-38x: Add arm_global_timer node
ARM: dts: marvell: fix PCI bus dtc warnings
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mvebu-pci.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt index 2de6f65ecfb1..e5af2e8461cf 100644 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt @@ -286,7 +286,7 @@ pcie-controller { status = "disabled"; }; - pcie@10,0 { + pcie@a,0 { device_type = "pci"; assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; reg = <0x5000 0 0 0 0>; |