fix small logic error in x86 sysupgrade script, which prevented upgrades from jffs2...
[openwrt.git] / target / linux / pxa / patches-2.6.21 / 042-gumstix-pxa270-mmc.patch
1 Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
2 ===================================================================
3 --- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
4 +++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
5 @@ -33,8 +33,9 @@
6
7 static struct pxamci_platform_data gumstix_mci_platform_data;
8
9 -static int gumstix_mci_init(struct device *dev, irqreturn_t (*gumstix_detect_int)(int, void *, struct pt_regs *), void *data)
10 +static int gumstix_mci_init(struct device *dev, irq_handler_t gumstix_detect_int, void *data)
11 {
12 +#ifndef CONFIG_ARCH_GUMSTIX_VERDEX
13 int err;
14
15 pxa_gpio_mode(GPIO6_MMCCLK_MD);
16 @@ -55,6 +56,17 @@ static int gumstix_mci_init(struct devic
17 }
18
19 err = set_irq_type(GUMSTIX_IRQ_GPIO_nSD_DETECT, IRQT_BOTHEDGE);
20 +#else
21 + // Setup GPIOs for MMC on the 120-pin connector
22 + // There is no card detect on a uSD connector so no interrupt to register
23 + // There is no WP detect GPIO line either
24 + pxa_gpio_mode(GPIO92_MMCDAT0_MD);
25 + pxa_gpio_mode(GPIO112_MMCCMD_MD);
26 + pxa_gpio_mode(GPIO110_MMCDAT2_MD);
27 + pxa_gpio_mode(GPIO111_MMCDAT3_MD);
28 + pxa_gpio_mode(GPIO109_MMCDAT1_MD);
29 + pxa_gpio_mode(GPIO32_MMCCLK_MD);
30 +#endif
31
32 return 0;
33 }
This page took 0.041678 seconds and 5 git commands to generate.