diff options
author | Robert Jarzmik <robert.jarzmik@atosorigin.com> | 2011-12-17 06:49:51 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 05:32:25 -0500 |
commit | 43a90877e613f990670119716a113673c2715f7b (patch) | |
tree | 513031d7ad0905ff7506e2f437987de6d4f0b4be | |
parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) |
mioa701: add newly available DoC G3 chip
As the mioa701 board has a M-Systems DiskOnChip G3 chip, add
it to the platform resources of the board.
Signed-off-by: Robert Jarzmik <robert.jarzmik@atosorigin.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index b938fc2c316a..dba02b78e32c 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <mach/pxa27x-udc.h> | 53 | #include <mach/pxa27x-udc.h> |
54 | #include <mach/camera.h> | 54 | #include <mach/camera.h> |
55 | #include <mach/audio.h> | 55 | #include <mach/audio.h> |
56 | #include <mach/smemc.h> | ||
56 | #include <media/soc_camera.h> | 57 | #include <media/soc_camera.h> |
57 | 58 | ||
58 | #include <mach/mioa701.h> | 59 | #include <mach/mioa701.h> |
@@ -390,24 +391,19 @@ static struct pxamci_platform_data mioa701_mci_info = { | |||
390 | }; | 391 | }; |
391 | 392 | ||
392 | /* FlashRAM */ | 393 | /* FlashRAM */ |
393 | static struct resource strataflash_resource = { | 394 | static struct resource docg3_resource = { |
394 | .start = PXA_CS0_PHYS, | 395 | .start = PXA_CS0_PHYS, |
395 | .end = PXA_CS0_PHYS + SZ_64M - 1, | 396 | .end = PXA_CS0_PHYS + SZ_8K - 1, |
396 | .flags = IORESOURCE_MEM, | 397 | .flags = IORESOURCE_MEM, |
397 | }; | 398 | }; |
398 | 399 | ||
399 | static struct physmap_flash_data strataflash_data = { | 400 | static struct platform_device docg3 = { |
400 | .width = 2, | 401 | .name = "docg3", |
401 | /* .set_vpp = mioa701_set_vpp, */ | ||
402 | }; | ||
403 | |||
404 | static struct platform_device strataflash = { | ||
405 | .name = "physmap-flash", | ||
406 | .id = -1, | 402 | .id = -1, |
407 | .resource = &strataflash_resource, | 403 | .resource = &docg3_resource, |
408 | .num_resources = 1, | 404 | .num_resources = 1, |
409 | .dev = { | 405 | .dev = { |
410 | .platform_data = &strataflash_data, | 406 | .platform_data = NULL, |
411 | }, | 407 | }, |
412 | }; | 408 | }; |
413 | 409 | ||
@@ -685,7 +681,7 @@ static struct platform_device *devices[] __initdata = { | |||
685 | &pxa2xx_pcm, | 681 | &pxa2xx_pcm, |
686 | &mioa701_sound, | 682 | &mioa701_sound, |
687 | &power_dev, | 683 | &power_dev, |
688 | &strataflash, | 684 | &docg3, |
689 | &gpio_vbus, | 685 | &gpio_vbus, |
690 | &mioa701_camera, | 686 | &mioa701_camera, |
691 | &mioa701_board, | 687 | &mioa701_board, |
@@ -720,6 +716,15 @@ static void __init mioa701_machine_init(void) | |||
720 | RTTR = 32768 - 1; /* Reset crazy WinCE value */ | 716 | RTTR = 32768 - 1; /* Reset crazy WinCE value */ |
721 | UP2OCR = UP2OCR_HXOE; | 717 | UP2OCR = UP2OCR_HXOE; |
722 | 718 | ||
719 | /* | ||
720 | * Set up the flash memory : DiskOnChip G3 on first static memory bank | ||
721 | */ | ||
722 | __raw_writel(0x7ff02dd8, MSC0); | ||
723 | __raw_writel(0x0001c391, MCMEM0); | ||
724 | __raw_writel(0x0001c391, MCATT0); | ||
725 | __raw_writel(0x0001c391, MCIO0); | ||
726 | |||
727 | |||
723 | pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config)); | 728 | pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config)); |
724 | pxa_set_ffuart_info(NULL); | 729 | pxa_set_ffuart_info(NULL); |
725 | pxa_set_btuart_info(NULL); | 730 | pxa_set_btuart_info(NULL); |