diff options
Diffstat (limited to 'arch/arm/mach-pxa/corgi.c')
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 3d1dcb9ac08..3fb0fc09908 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -50,14 +50,13 @@ | |||
50 | #include <mach/udc.h> | 50 | #include <mach/udc.h> |
51 | #include <mach/pxa2xx_spi.h> | 51 | #include <mach/pxa2xx_spi.h> |
52 | #include <mach/corgi.h> | 52 | #include <mach/corgi.h> |
53 | #include <mach/sharpsl.h> | 53 | #include <mach/sharpsl_pm.h> |
54 | 54 | ||
55 | #include <asm/mach/sharpsl_param.h> | 55 | #include <asm/mach/sharpsl_param.h> |
56 | #include <asm/hardware/scoop.h> | 56 | #include <asm/hardware/scoop.h> |
57 | 57 | ||
58 | #include "generic.h" | 58 | #include "generic.h" |
59 | #include "devices.h" | 59 | #include "devices.h" |
60 | #include "sharpsl.h" | ||
61 | 60 | ||
62 | static unsigned long corgi_pin_config[] __initdata = { | 61 | static unsigned long corgi_pin_config[] __initdata = { |
63 | /* Static Memory I/O */ | 62 | /* Static Memory I/O */ |
@@ -185,8 +184,6 @@ static struct scoop_pcmcia_config corgi_pcmcia_config = { | |||
185 | .num_devs = 1, | 184 | .num_devs = 1, |
186 | }; | 185 | }; |
187 | 186 | ||
188 | EXPORT_SYMBOL(corgiscoop_device); | ||
189 | |||
190 | static struct w100_mem_info corgi_fb_mem = { | 187 | static struct w100_mem_info corgi_fb_mem = { |
191 | .ext_cntl = 0x00040003, | 188 | .ext_cntl = 0x00040003, |
192 | .sdram_mode_reg = 0x00650021, | 189 | .sdram_mode_reg = 0x00650021, |
@@ -446,7 +443,7 @@ static struct platform_device corgiled_device = { | |||
446 | static struct pxamci_platform_data corgi_mci_platform_data = { | 443 | static struct pxamci_platform_data corgi_mci_platform_data = { |
447 | .detect_delay_ms = 250, | 444 | .detect_delay_ms = 250, |
448 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 445 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
449 | .gpio_card_detect = -1, | 446 | .gpio_card_detect = CORGI_GPIO_nSD_DETECT, |
450 | .gpio_card_ro = CORGI_GPIO_nSD_WP, | 447 | .gpio_card_ro = CORGI_GPIO_nSD_WP, |
451 | .gpio_power = CORGI_GPIO_SD_PWR, | 448 | .gpio_power = CORGI_GPIO_SD_PWR, |
452 | }; | 449 | }; |
@@ -715,7 +712,6 @@ static void __init fixup_corgi(struct machine_desc *desc, | |||
715 | sharpsl_save_param(); | 712 | sharpsl_save_param(); |
716 | mi->nr_banks=1; | 713 | mi->nr_banks=1; |
717 | mi->bank[0].start = 0xa0000000; | 714 | mi->bank[0].start = 0xa0000000; |
718 | mi->bank[0].node = 0; | ||
719 | if (machine_is_corgi()) | 715 | if (machine_is_corgi()) |
720 | mi->bank[0].size = (32*1024*1024); | 716 | mi->bank[0].size = (32*1024*1024); |
721 | else | 717 | else |