summaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-26 22:38:38 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-26 22:38:38 +0100
commit4c929c8a8837f4e5acdec5883a1b64a240751e2f (patch)
tree19ca9af00b75642547ebb9863873acb1d77f5513 /drivers/pci/hotplug.c
parentd98eb5cfb0ac050ed8c8fafd029b94d451189864 (diff)
parentf7a9b36517d38cfa2213a346b154d2d7046ff223 (diff)
Merge tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
From Linus Walleij <linus.walleij@linaro.org>: This series will do the following: - Switch the Integrator/AP and /CP to use the SoC bus when booting from device tree. - Group all devices on the SoC below this bus so as to set a good example of how to do this. The bus was invented by Lee Jones, let's show how it's to be used on a DT:ed SoC. - Fetch the special system controller offsets from two special device tree nodes for each case and replace the static mappings with these at boot. - Move some static remaps to the ATAG-only code path and delete some static maps that aren't used. - Push dependencies on system controller remaps down to the Integrator/AP board file and the PCIv3 driver respectively and use only dynamic remappings. - Fix up conditional BUG() usage in the PCIv3 driver to be simpler and more to the point. * tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: use BUG_ON where possible ARM: integrator: push down SC dependencies ARM: integrator: delete static UART1 mapping ARM: integrator: delete SC mapping on the CP ARM: integrator: remove static CP syscon mapping ARM: integrator: remove static AP syscon mapping ARM: integrator: hook the CP into the SoC bus ARM: integrator: hook the AP into the SoC bus Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pci/hotplug.c')
0 files changed, 0 insertions, 0 deletions