diff options
author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2009-10-09 02:26:45 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2009-11-05 23:03:20 -0500 |
commit | 5d8965557318fabb1680d1817c2afc2714b6d3ce (patch) | |
tree | cf002d9825f4993c34b231b8a8b3004bffcf0715 | |
parent | 662aeced1512e008e5613b91de8e8b8e01017cb5 (diff) |
[ARM] OpenRD base: Initialize PCI express and i2c
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Dieter Kiermaier <dk-arm-linux@gmx.de>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
-rw-r--r-- | arch/arm/mach-kirkwood/openrd_base-setup.c | 12 |
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) | |||
70 | kirkwood_ge00_init(&openrd_base_ge00_data); | 70 | kirkwood_ge00_init(&openrd_base_ge00_data); |
71 | kirkwood_sata_init(&openrd_base_sata_data); | 71 | kirkwood_sata_init(&openrd_base_sata_data); |
72 | kirkwood_sdio_init(&openrd_base_mvsdio_data); | 72 | kirkwood_sdio_init(&openrd_base_mvsdio_data); |
73 | |||
74 | kirkwood_i2c_init(); | ||
73 | } | 75 | } |
74 | 76 | ||
77 | static int __init openrd_base_pci_init(void) | ||
78 | { | ||
79 | if (machine_is_openrd_base()) | ||
80 | kirkwood_pcie_init(); | ||
81 | |||
82 | return 0; | ||
83 | } | ||
84 | subsys_initcall(openrd_base_pci_init); | ||
85 | |||
86 | |||
75 | MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") | 87 | MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") |
76 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ | 88 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ |
77 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | 89 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, |