summaryrefslogtreecommitdiffstats
path: root/target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch
blob: 02fddd64ba73fba48fb4e367502859fc5d770cf2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -33,8 +33,9 @@
 
 static struct pxamci_platform_data gumstix_mci_platform_data;
 
-static int gumstix_mci_init(struct device *dev, irqreturn_t (*gumstix_detect_int)(int, void *, struct pt_regs *), void *data)
+static int gumstix_mci_init(struct device *dev, irq_handler_t gumstix_detect_int, void *data)
 {
+#ifndef CONFIG_ARCH_GUMSTIX_VERDEX 
 	int err;
 
 	pxa_gpio_mode(GPIO6_MMCCLK_MD);
@@ -55,6 +56,17 @@ static int gumstix_mci_init(struct devic
 	}
 
 	err = set_irq_type(GUMSTIX_IRQ_GPIO_nSD_DETECT, IRQT_BOTHEDGE);
+#else
+	// Setup GPIOs for MMC on the 120-pin connector
+	// There is no card detect on a uSD connector so no interrupt to register
+	// There is no WP detect GPIO line either
+	pxa_gpio_mode(GPIO92_MMCDAT0_MD);
+	pxa_gpio_mode(GPIO112_MMCCMD_MD);
+	pxa_gpio_mode(GPIO110_MMCDAT2_MD);
+	pxa_gpio_mode(GPIO111_MMCDAT3_MD);
+	pxa_gpio_mode(GPIO109_MMCDAT1_MD);
+	pxa_gpio_mode(GPIO32_MMCCLK_MD);
+#endif
 
 	return 0;
 }