aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2010-08-25 14:30:02 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:53 -0600
commit9276a2f05cd460d05c25729021ec71b9ad6eeee9 (patch)
tree1704fdc8cd988960d7831b57f1b8514c6b43fbce /arch
parenta77c874f9b85691ea4af5362e2b5c9fc55a76acc (diff)
downloadlinux-2.6.34-ux500-9276a2f05cd460d05c25729021ec71b9ad6eeee9.tar.gz
Took the all the patches for pmem from the android branch:
pmem: Add pmem driver Signed-off-by: Rebecca Schultz <rschultz@google.com> pmem: Use the thread group leader insted of the current thread. Instead of keeping track of the current thread, use the thread group leader Signed-off-by: Rebecca Schultz <rschultz@google.com> pmem: Add some apis to reference and flush pmem files by file struct The api to refer to pmem files by fd should be depricated, it can cause problems if a processes fd table changes while the kernel is processing data in a pmem file. This change adds the safer api. Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> pmem: Remove unused depricated fd api to pmem. Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> pmem: Remove error message when calling get_pmem_addr This call is used from the mdp driver to determine if the memory is in pmem or in the fb. We will encounter this case during normal operation so this error message should be removed. Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> pmem: Add include sched.h to fix compile errors Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> pmem: remove HW3D_* ioctls Signed-off-by: Dima Zavin <dima@android.com> pmem: Expose is_pmem_file to the in-kernel users. Signed-off-by: Dima Zavin <dima@android.com> pmem: Make the exposed functions be noops if CONFIG_ANDROID_PMEM is not set. Signed-off-by: Dima Zavin <dima@android.com> misc: pmem: don't flush if file was opened with O_SYNC Change-Id: I067218658a0d7f7ecc1fe73e9ff6b0c3b3054653 Signed-off-by: Dima Zavin <dima@android.com> pmem: Add cache flush ioctl for pmem buffers Change-Id: I9156bad829e8c65087f122b48cc57638902fab12 Signed-off-by: Dima Zavin <dima@android.com> WP254615 [3/3] android pmem updates Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> pmem: updated after dmac api changes pmem: disable PMEM_DEBUG Modified pmem_mmap() to enable mapping the same memory area from two different processes. The data coherency in the memory area needs to be handled by the processes. Change-Id: If6b39302493025b4b4f6762a7dc6ea469af42200 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2949 Reviewed-by: Paramanand SINGH <paramanand.singh@stericsson.com> Reviewed-by: Mian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com> Tested-by: Paramanand SINGH <paramanand.singh@stericsson.com> Reviewed-by: Pankaj SEN <pankaj.sen@stericsson.com> Tested-by: Pankaj SEN <pankaj.sen@stericsson.com> Reviewed-by: Prashanth B P <prashanth.bp@stericsson.com> Tested-by: Prashanth B P <prashanth.bp@stericsson.com> Reviewed-by: Thierry STRUDEL <thierry.strudel@stericsson.com> PMEM: fixed cache clean issue Initial backport of STE specific implementation of PMEM_CACHE_CLEAN from 2.6.29 to 2.6.34 was not cleaning L1 cache while requested. Change-Id: Ieebda59fd7064e59567f48efcc893554b5c1d0f4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2987 Reviewed-by: Pankaj SEN <pankaj.sen@stericsson.com> Tested-by: Pankaj SEN <pankaj.sen@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Fixed the PMEM_CACHE_CLEAN code. There was a minor mistake in previous change http://gerrit.lud.stericsson.com/gerrit/2987 Change-Id: I97d36fc9ba9187822081df926c916507602451e9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/3037 Reviewed-by: Paramanand SINGH <paramanand.singh@stericsson.com> Tested-by: Paramanand SINGH <paramanand.singh@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Fixed devices file to new pmem imp. More fixes for pmem init, and removed spaces. Change-Id: I8f2cb02ba3263f46945491580d7681c712c067a1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/4104 Tested-by: Robert MARKLUND <robert.marklund@stericsson.com> Reviewed-by: Robert ROSENGREN <robert.rosengren@stericsson.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-ux500/devices.c58
1 files changed, 30 insertions, 28 deletions
diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c
index aab9f3e6501..e962102e51d 100755
--- a/arch/arm/mach-ux500/devices.c
+++ b/arch/arm/mach-ux500/devices.c
@@ -96,14 +96,14 @@ static struct msp_i2s_platform_data msp0_platform_data = {
};
static struct resource u8500_msp_0_resources[] = {
[0] = {
- .start = U8500_MSP0_BASE,
- .end = U8500_MSP0_BASE + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- },
+ .start = U8500_MSP0_BASE,
+ .end = U8500_MSP0_BASE + SZ_4K - 1,
+ .flags = IORESOURCE_MEM,
+ },
[1] = {
- .start = IRQ_MSP0,
- .end = IRQ_MSP0,
- .flags = IORESOURCE_IRQ}
+ .start = IRQ_MSP0,
+ .end = IRQ_MSP0,
+ .flags = IORESOURCE_IRQ}
};
struct platform_device u8500_msp0_device = {
.name = "MSP_I2S",
@@ -127,14 +127,14 @@ static struct msp_i2s_platform_data msp1_platform_data = {
};
static struct resource u8500_msp_1_resources[] = {
[0] = {
- .start = U8500_MSP1_BASE,
- .end = U8500_MSP1_BASE + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- },
+ .start = U8500_MSP1_BASE,
+ .end = U8500_MSP1_BASE + SZ_4K - 1,
+ .flags = IORESOURCE_MEM,
+ },
[1] = {
- .start = IRQ_MSP1,
- .end = IRQ_MSP1,
- .flags = IORESOURCE_IRQ}
+ .start = IRQ_MSP1,
+ .end = IRQ_MSP1,
+ .flags = IORESOURCE_IRQ}
};
struct platform_device u8500_msp1_device = {
.name = "MSP_I2S",
@@ -246,7 +246,7 @@ UX500_I2C_PDEVICE(3);
static struct shrm_plat_data shrm_platform_data = {
- .pshm_dev_data = 0
+ .pshm_dev_data = 0
};
static struct resource u8500_shrm_resources[] = {
@@ -328,11 +328,13 @@ struct platform_device ux500_b2r2_device = {
};
#ifdef CONFIG_ANDROID_PMEM
-static void __init early_pmem_generic_parse(char **p, struct android_pmem_platform_data * data)
+static int __init early_pmem_generic_parse(char *p, struct android_pmem_platform_data * data)
{
- data->size = memparse(*p, p);
- if (**p == '@')
- data->start = memparse(*p + 1, p);
+ data->size = memparse(p, &p);
+ if (*p == '@')
+ data->start = memparse(p + 1, &p);
+
+ return 0;
}
/********************************************************************************
@@ -347,11 +349,11 @@ static struct android_pmem_platform_data pmem_pdata = {
.size = 0,
};
-static void __init early_pmem(char **p)
+static int __init early_pmem(char *p)
{
- early_pmem_generic_parse(p, &pmem_pdata);
+ return early_pmem_generic_parse(p, &pmem_pdata);
}
-__early_param("pmem=", early_pmem);
+early_param("pmem", early_pmem);
struct platform_device u8500_pmem_device = {
.name = "android_pmem",
@@ -373,11 +375,11 @@ static struct android_pmem_platform_data pmem_mio_pdata = {
.size = 0,
};
-static void __init early_pmem_mio(char **p)
+static int __init early_pmem_mio(char *p)
{
- early_pmem_generic_parse(p, &pmem_mio_pdata);
+ return early_pmem_generic_parse(p, &pmem_mio_pdata);
}
-__early_param("pmem_mio=", early_pmem_mio);
+early_param("pmem_mio", early_pmem_mio);
struct platform_device u8500_pmem_mio_device = {
.name = "android_pmem",
@@ -399,11 +401,11 @@ static struct android_pmem_platform_data pmem_hwb_pdata = {
.size = 0,
};
-static void __init early_pmem_hwb(char **p)
+static int __init early_pmem_hwb(char *p)
{
- early_pmem_generic_parse(p, &pmem_hwb_pdata);
+ return early_pmem_generic_parse(p, &pmem_hwb_pdata);
}
-__early_param("pmem_hwb=", early_pmem_hwb);
+early_param("pmem_hwb", early_pmem_hwb);
struct platform_device u8500_pmem_hwb_device = {
.name = "android_pmem",