diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/db88f6281-bp-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index 39bdf4bcace9..16f6691e7c68 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |||
@@ -51,6 +51,14 @@ static struct mvsdio_platform_data db88f6281_mvsdio_data = { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | static unsigned int db88f6281_mpp_config[] __initdata = { | 53 | static unsigned int db88f6281_mpp_config[] __initdata = { |
54 | MPP0_NF_IO2, | ||
55 | MPP1_NF_IO3, | ||
56 | MPP2_NF_IO4, | ||
57 | MPP3_NF_IO5, | ||
58 | MPP4_NF_IO6, | ||
59 | MPP5_NF_IO7, | ||
60 | MPP18_NF_IO0, | ||
61 | MPP19_NF_IO1, | ||
54 | MPP37_GPIO, | 62 | MPP37_GPIO, |
55 | MPP38_GPIO, | 63 | MPP38_GPIO, |
56 | 0 | 64 | 0 |
@@ -74,9 +82,15 @@ static void __init db88f6281_init(void) | |||
74 | 82 | ||
75 | static int __init db88f6281_pci_init(void) | 83 | static int __init db88f6281_pci_init(void) |
76 | { | 84 | { |
77 | if (machine_is_db88f6281_bp()) | 85 | if (machine_is_db88f6281_bp()) { |
78 | kirkwood_pcie_init(); | 86 | u32 dev, rev; |
79 | 87 | ||
88 | kirkwood_pcie_id(&dev, &rev); | ||
89 | if (dev == MV88F6282_DEV_ID) | ||
90 | kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); | ||
91 | else | ||
92 | kirkwood_pcie_init(KW_PCIE0); | ||
93 | } | ||
80 | return 0; | 94 | return 0; |
81 | } | 95 | } |
82 | subsys_initcall(db88f6281_pci_init); | 96 | subsys_initcall(db88f6281_pci_init); |