From 2ef319abe11fe2ee3f5cc1a4a08c7dcd43c39f5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E6=9D=9C=E5=9D=A4=E6=98=8E?= Date: Tue, 1 Jun 2010 03:18:48 +0000 Subject: [PATCH] Add dsp pmem --- arch/arm/mach-rk2818/board-midsdk.c | 1 + arch/arm/mach-rk2818/devices.c | 6 ++---- arch/arm/mach-rk2818/devices.h | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c index 4644f728025b..b0555584bdc4 100644 --- a/arch/arm/mach-rk2818/board-midsdk.c +++ b/arch/arm/mach-rk2818/board-midsdk.c @@ -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, diff --git a/arch/arm/mach-rk2818/devices.c b/arch/arm/mach-rk2818/devices.c index 0b9130859cf3..21db7b6d527a 100644 --- a/arch/arm/mach-rk2818/devices.c +++ b/arch/arm/mach-rk2818/devices.c @@ -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[] = { diff --git a/arch/arm/mach-rk2818/devices.h b/arch/arm/mach-rk2818/devices.h index 4eca8fe1406f..041467a3fc84 100644 --- a/arch/arm/mach-rk2818/devices.h +++ b/arch/arm/mach-rk2818/devices.h @@ -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; -- 2.34.1