diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-12-12 16:36:13 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:41:11 +0100 |
commit | 481100506b34d666243832c3f2aee905c03cb8e7 (patch) | |
tree | cee1b897a4c87c5c211d75d70ecb73095001576b /drivers/video/sh_mobile_lcdcfb.h | |
parent | 974d250be2c70c7bf899275b23b241685d4ed7f8 (diff) | |
download | linux-481100506b34d666243832c3f2aee905c03cb8e7.tar.bz2 |
fbdev: sh_mobile_meram: Allocate ICBs automatically
Instead of manually specifying the ICBs to use in platform data,
allocate them automatically at runtime. The range of reserved ICBs (for
instance to be used through UIO), if any, is passed in the platform data
reserved_icbs field as a bitmask.
The MERAM registration function now returns a pointer to an opaque MERAM
object, which is passed to the update and unregistration functions.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.h')
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.h b/drivers/video/sh_mobile_lcdcfb.h index 19a4cd74c89a..bf1707cd3657 100644 --- a/drivers/video/sh_mobile_lcdcfb.h +++ b/drivers/video/sh_mobile_lcdcfb.h @@ -59,7 +59,7 @@ struct sh_mobile_lcdc_chan { unsigned long *reg_offs; unsigned long ldmt1r_value; unsigned long enabled; /* ME and SE in LDCNT2R */ - int meram_enabled; + void *meram; struct mutex open_lock; /* protects the use counter */ int use_count; |