forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pxa/board' into next/boards

Browse source 
* pxa/board:
  mioa701: add newly available DoC G3 chip
This commit is contained in:
Arnd Bergmann 2011-12-28 10:47:00 +00:00
commit e006d6563b
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
arch/arm/mach-pxa/mioa701.c
View file

@ -53,6 +53,7 @@
#include <mach/pxa27x-udc.h> #include <mach/pxa27x-udc.h>
#include <mach/camera.h> #include <mach/camera.h>
#include <mach/audio.h> #include <mach/audio.h>
#include <mach/smemc.h>
#include <media/soc_camera.h> #include <media/soc_camera.h>
#include <mach/mioa701.h> #include <mach/mioa701.h>
@ -390,24 +391,19 @@ static struct pxamci_platform_data mioa701_mci_info = {
}; };
/* FlashRAM */ /* FlashRAM */
static struct resource strataflash_resource = { static struct resource docg3_resource = {
.start = PXA_CS0_PHYS, .start = PXA_CS0_PHYS,
.end = PXA_CS0_PHYS + SZ_64M - 1, .end = PXA_CS0_PHYS + SZ_8K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
static struct physmap_flash_data strataflash_data = { static struct platform_device docg3 = {
.width = 2, .name = "docg3",
/* .set_vpp = mioa701_set_vpp, */
};
static struct platform_device strataflash = {
.name = "physmap-flash",
.id = -1, .id = -1,
.resource = &strataflash_resource, .resource = &docg3_resource,
.num_resources = 1, .num_resources = 1,
.dev = { .dev = {
.platform_data = &strataflash_data, .platform_data = NULL,
}, },
}; };
@ -685,7 +681,7 @@ static struct platform_device *devices[] __initdata = {
&pxa2xx_pcm, &pxa2xx_pcm,
&mioa701_sound, &mioa701_sound,
&power_dev, &power_dev,
&strataflash, &docg3,
&gpio_vbus, &gpio_vbus,
&mioa701_camera, &mioa701_camera,
&mioa701_board, &mioa701_board,
@ -720,6 +716,15 @@ static void __init mioa701_machine_init(void)
RTTR = 32768 - 1; /* Reset crazy WinCE value */ RTTR = 32768 - 1; /* Reset crazy WinCE value */
UP2OCR = UP2OCR_HXOE; UP2OCR = UP2OCR_HXOE;
/*
* Set up the flash memory : DiskOnChip G3 on first static memory bank
*/
__raw_writel(0x7ff02dd8, MSC0);
__raw_writel(0x0001c391, MCMEM0);
__raw_writel(0x0001c391, MCATT0);
__raw_writel(0x0001c391, MCIO0);
pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config)); pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));
pxa_set_ffuart_info(NULL); pxa_set_ffuart_info(NULL);
pxa_set_btuart_info(NULL); pxa_set_btuart_info(NULL);