[ARM] 3820/1: iop3xx: factor out shared pci code

Merge the iop32x PCI code and iop33x PCI code into plat-iop/pci.c.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc arch/arm/plat-iop/Makefile
Simple merge

diff --cc arch/arm/plat-iop/pci.c
Simple merge

diff --cc include/asm-arm/hardware/iop3xx.h
Simple merge

diff --cc include/asm-arm/mach/pci.h
Simple merge