diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-05-15 15:36:57 +0200 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-27 16:02:11 +0000 |
commit | 36e5722089ad757e9d15cd3b394389042cb28003 (patch) | |
tree | b3917fb794fbb88e7d0c4ea563c7bc7166982804 | |
parent | 670ee03ccc29b3a14c6cbe04241c903342442c23 (diff) | |
download | op-kernel-dev-36e5722089ad757e9d15cd3b394389042cb28003.zip op-kernel-dev-36e5722089ad757e9d15cd3b394389042cb28003.tar.gz |
arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface
Now that the PCIe mvebu driver is usable on Kirkwood, use it instead
of the legacy PCIe code, since it allows to describe the PCIe
interfaces in the Device Tree.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/boot/dts/kirkwood-iconnect.dts | 8 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 12ccf74..e591d5d 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts @@ -109,6 +109,14 @@ reg = <0x980000 0x1f400000>; }; }; + + pcie-controller { + status = "okay"; + + pcie@1,0 { + status = "okay"; + }; + }; }; gpio-leds { diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index c8ebde4..98b5ad1 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c @@ -22,11 +22,3 @@ void __init iconnect_init(void) { kirkwood_ge00_init(&iconnect_ge00_data); } - -static int __init iconnect_pci_init(void) -{ - if (of_machine_is_compatible("iom,iconnect")) - kirkwood_pcie_init(KW_PCIE0); - return 0; -} -subsys_initcall(iconnect_pci_init); |