Add dsp pmem
author杜坤明 <dkm@rock-chips.com>
Tue, 1 Jun 2010 03:18:48 +0000 (03:18 +0000)
committer黄涛 <huangtao@rock-chips.com>
Mon, 21 Jun 2010 05:35:20 +0000 (13:35 +0800)
arch/arm/mach-rk2818/board-midsdk.c
arch/arm/mach-rk2818/devices.c
arch/arm/mach-rk2818/devices.h

index 4644f728025b3aec26b8144435ba5bac3e58153c..b0555584bdc47b83c8878c0926f1e568440d4eab 100644 (file)
@@ -409,6 +409,7 @@ static struct platform_device *devices[] __initdata = {
        &rk2818_device_i2s,
 #if defined(CONFIG_ANDROID_PMEM)
        &rk2818_device_pmem,
+       &rk2818_device_pmem_dsp,
 #endif
        &rk2818_device_adc,
        &rk2818_device_adckey,
index 0b9130859cf3b997ed1a61f05cc26a7a36baa9ff..21db7b6d527a491a880c9a1b7ffac89d24d5de5e 100644 (file)
@@ -387,21 +387,20 @@ struct platform_device rk2818_device_dsp = {
 
 
 #if defined(CONFIG_ANDROID_PMEM)
+
 static struct android_pmem_platform_data pmem_pdata = {
        .name = "pmem",
        .no_allocator = 1,
        .cached = 1,
        .start = 0x6f000000,
        .size =  0x1000000,
-       //.start = 0x67000000,
-       //.size =  0x1000000,
 };
 
 static struct android_pmem_platform_data pmem_pdata_dsp = {
        .name = "pmem-dsp",
        .no_allocator = 1,
        .cached = 0,
-    .start = 0x66B00000,
+    .start = 0x6db00000,
        .size =  0x1500000,
 };
 
@@ -417,7 +416,6 @@ struct platform_device rk2818_device_pmem_dsp = {
        .dev = { .platform_data = &pmem_pdata_dsp },
 };
 
-
 #endif
 #if defined(CONFIG_MTD_NAND_RK2818)  
 static struct resource nand_resources[] = {
index 4eca8fe1406f012df266d5f3a96ea37fda28f899..041467a3fc8424e6b36646d206f629d78f301ffa 100644 (file)
@@ -33,6 +33,7 @@ extern struct rk2818_sdmmc_platform_data default_sdmmc1_data;
 extern struct platform_device rk2818_device_dm9k;
 extern struct platform_device rk2818_device_i2s;
 extern struct platform_device rk2818_device_pmem;
+extern struct platform_device rk2818_device_pmem_dsp;
 extern struct platform_device rk2818_device_fb;
 extern struct platform_device rk2818_device_adc;
 extern struct platform_device rk2818_device_adckey;