Merge branch 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld into next/arm64

Browse source

* 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld:
  arm64: defconfig: Enable PCI generic host bridge by default
  arm64: Juno: Add support for the PCIe host bridge on Juno R1
  Documentation: of: Document the bindings used by Juno R1 PCIe host bridge

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2015-10-27 08:51:50 +09:00

parent 17e2aa01e4 324e84cb92

commit 8713181dce

5 changed files with 44 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt

View file

12

Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

20

arch/arm64/boot/dts/arm/juno-r1.dts

View file

1

arch/arm64/configs/defconfig

View file