diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 01:00:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 01:00:15 +0200 |
| commit | 596fd95ea606548adaa8310a7c05a6dcfec46f16 (patch) | |
| tree | 2d1f5bb81dff7a40ab030a87d6c7fb5ae2bcf559 /arch/arm/mach-u300/i2c.c | |
| parent | 99ff1830426ed59cc722091eadffd17736bdf148 (diff) | |
| parent | f55b2b56cd37fa8bcfcb75248c27094eaf09e04c (diff) | |
| download | blackbird-op-linux-596fd95ea606548adaa8310a7c05a6dcfec46f16.tar.gz blackbird-op-linux-596fd95ea606548adaa8310a7c05a6dcfec46f16.zip | |
Merge tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
From Linus Walleij:
This is a patch series that:
- Pulls the Integrator/AP PCI bridge driver into one file
- Adds full device tree support for it
- Keeps ATAG support around for the time being
* tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: integrator: basic PCIv3 device tree support
ARM: integrator: move static ioremapping into PCIv3 driver
ARM: integrator: move VGA base assignment
ARM: integrator: remap PCIv3 base dynamically
ARM: integrator: move V3 register definitions into driver
ARM: integrator: move PCI base address grab to probe
ARM: integrator: grab PCI error IRQ in probe()
ARM: integrator: convert PCIv3 bridge to platform device
ARM: integrator: merge PCIv3 driver into one file
ARM: pci: create pci_common_init_dev()
Documentation/devicetree: add a small note on PCI
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-u300/i2c.c')
0 files changed, 0 insertions, 0 deletions
