diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 16 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 10 |
2 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index b09f724..c078144 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -192,4 +192,20 @@ config S5PV210_SETUP_FB default y help Common setup code for FIMD controller. + +config ANDROID_PMEM_MEMSIZE_PMEM + int "The size of PMEM (android)" + depends on ANDROID_PMEM && MACH_S5PC110_CRESPO + default "16384" + +config ANDROID_PMEM_MEMSIZE_PMEM_GPU1 + int "The size of PMEM for GPU" + depends on ANDROID_PMEM && MACH_S5PC110_CRESPO + default "10240" + +config ANDROID_PMEM_MEMSIZE_PMEM_ADSP + int "The size of PMEM for ADSP" + depends on ANDROID_PMEM && MACH_S5PC110_CRESPO + default "1024" + endif diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index 25e0971..4d5c76b 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -31,6 +31,11 @@ #include <mach/gpio.h> #include <mach/gpio-herring.h> +#ifdef CONFIG_ANDROID_PMEM +#include <linux/android_pmem.h> +#include <plat/media.h> +#endif + #include <plat/regs-serial.h> #include <plat/s5pv210.h> #include <plat/devs.h> @@ -2752,6 +2757,11 @@ static struct platform_device *herring_devices[] __initdata = { #endif &herring_i2c4_device, &herring_i2c6_device, +#ifdef CONFIG_ANDROID_PMEM + &pmem_device, + &pmem_gpu1_device, + &pmem_adsp_device, +#endif }; unsigned int HWREV=0; |