diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-18 21:49:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-18 21:55:04 -0700 |
| commit | 25f003285b7a0c212f1f6dbf5e07ed4471677a0f (patch) | |
| tree | 0b8984192b7b1a458dd9a86f9f0c1df6a61ed80b /arch/arm/boot/dts/mxs-pinfunc.h | |
| parent | bde19a7e7492f97701f011e4297bec6b992b22f8 (diff) | |
| parent | f6e670a3b62d23722d04e801244a068755a45b7a (diff) | |
| download | blackbird-obmc-linux-25f003285b7a0c212f1f6dbf5e07ed4471677a0f.tar.gz blackbird-obmc-linux-25f003285b7a0c212f1f6dbf5e07ed4471677a0f.zip | |
Merge branch 'spear/pcie-support-v10' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux into next/drivers
Merge "ARM: SPEAr13xx PCIe updates for v3.17" from Viresh Kumar:
This is another attempt to merge SPEAr PCIe updates after olof
pointed out *enough* issues with initial PULL request:
https://lkml.org/lkml/2014/7/9/641
Last version was sent here: http://patchwork.ozlabs.org/patch/368479/
and all the nits pointed out by Kishon & Bjorn are fixed in this pull
request.
Apart from ARM specific changes, this updates drivers/{pci|phy}. Bjorn
advised to get complete series via arm-soc tree earlier:
http://www.spinics.net/lists/linux-pci/msg30271.html
* 'spear/pcie-support-v10' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux:
ARM: SPEAr13xx: Update defconfigs
ARM: SPEAr13xx: Add pcie and miphy DT nodes
ARM: SPEAr13xx: Add bindings and dt node for misc block
ARM: SPEAr13xx: Fix static mapping table
phy: Add drivers for PCIe and SATA phy on SPEAr13xx
PCI: spear: Add PCIe driver for ST Microelectronics SPEAr13xx
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/mxs-pinfunc.h')
0 files changed, 0 insertions, 0 deletions
