summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/openrd_base-setup.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-04 16:22:32 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-04 16:22:32 +0100
commit79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch)
tree7d29e81580cba854042df4e33bdc8f38bbd65d03 /arch/arm/mach-kirkwood/openrd_base-setup.c
parentALSA: AACI: fix recording bug (diff)
parentMerge branch 'topic/pcm-dma-fix' into topic/core-change (diff)
downloadlinux-79598324838a25cc378ecbb8c29dd1e3d3951d35.tar.xz
linux-79598324838a25cc378ecbb8c29dd1e3d3951d35.zip
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'arch/arm/mach-kirkwood/openrd_base-setup.c')
-rw-r--r--arch/arm/mach-kirkwood/openrd_base-setup.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
index 947dfb8cd5b2..77617c722299 100644
--- a/arch/arm/mach-kirkwood/openrd_base-setup.c
+++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
@@ -70,8 +70,20 @@ static void __init openrd_base_init(void)
kirkwood_ge00_init(&openrd_base_ge00_data);
kirkwood_sata_init(&openrd_base_sata_data);
kirkwood_sdio_init(&openrd_base_mvsdio_data);
+
+ kirkwood_i2c_init();
}
+static int __init openrd_base_pci_init(void)
+{
+ if (machine_is_openrd_base())
+ kirkwood_pcie_init();
+
+ return 0;
+ }
+subsys_initcall(openrd_base_pci_init);
+
+
MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
/* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
.phys_io = KIRKWOOD_REGS_PHYS_BASE,