diff options
author | Nicolas Pitre <nico@cam.org> | 2009-02-14 03:15:55 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-02-26 20:22:26 -0500 |
commit | 8235ee009cd839265f5dc2dace2758471a823e68 (patch) | |
tree | 922072825553b5059f6532d1eaeb2308835d6a39 /arch/arm/mach-kirkwood/rd88f6281-setup.c | |
parent | 75bb6b9aab3255f440ef4e72a31978d1681105d6 (diff) |
[ARM] Kirkwood: SDIO driver registration for DB6281 and RD6281
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6281-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index a1ef8a91848e..a8b88a5570bd 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
@@ -24,8 +24,10 @@ | |||
24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
25 | #include <asm/mach/pci.h> | 25 | #include <asm/mach/pci.h> |
26 | #include <mach/kirkwood.h> | 26 | #include <mach/kirkwood.h> |
27 | #include <plat/mvsdio.h> | ||
27 | #include <plat/orion_nand.h> | 28 | #include <plat/orion_nand.h> |
28 | #include "common.h" | 29 | #include "common.h" |
30 | #include "mpp.h" | ||
29 | 31 | ||
30 | static struct mtd_partition rd88f6281_nand_parts[] = { | 32 | static struct mtd_partition rd88f6281_nand_parts[] = { |
31 | { | 33 | { |
@@ -91,6 +93,15 @@ static struct mv_sata_platform_data rd88f6281_sata_data = { | |||
91 | .n_ports = 2, | 93 | .n_ports = 2, |
92 | }; | 94 | }; |
93 | 95 | ||
96 | static struct mvsdio_platform_data rd88f6281_mvsdio_data = { | ||
97 | .gpio_card_detect = 28, | ||
98 | }; | ||
99 | |||
100 | static unsigned int rd88f6281_mpp_config[] __initdata = { | ||
101 | MPP28_GPIO, | ||
102 | 0 | ||
103 | }; | ||
104 | |||
94 | static void __init rd88f6281_init(void) | 105 | static void __init rd88f6281_init(void) |
95 | { | 106 | { |
96 | u32 dev, rev; | 107 | u32 dev, rev; |
@@ -99,6 +110,7 @@ static void __init rd88f6281_init(void) | |||
99 | * Basic setup. Needs to be called early. | 110 | * Basic setup. Needs to be called early. |
100 | */ | 111 | */ |
101 | kirkwood_init(); | 112 | kirkwood_init(); |
113 | kirkwood_mpp_conf(rd88f6281_mpp_config); | ||
102 | 114 | ||
103 | kirkwood_ehci_init(); | 115 | kirkwood_ehci_init(); |
104 | 116 | ||
@@ -114,6 +126,7 @@ static void __init rd88f6281_init(void) | |||
114 | 126 | ||
115 | kirkwood_rtc_init(); | 127 | kirkwood_rtc_init(); |
116 | kirkwood_sata_init(&rd88f6281_sata_data); | 128 | kirkwood_sata_init(&rd88f6281_sata_data); |
129 | kirkwood_sdio_init(&rd88f6281_mvsdio_data); | ||
117 | kirkwood_uart0_init(); | 130 | kirkwood_uart0_init(); |
118 | kirkwood_xor0_init(); | 131 | kirkwood_xor0_init(); |
119 | kirkwood_xor1_init(); | 132 | kirkwood_xor1_init(); |