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>

1 files changed, 16 insertions, 11 deletions

diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index f7700fcb054a..e0f650c843c7 100644
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -17,8 +17,13 @@ enum {
 struct sh_mobile_meram_priv;
 struct sh_mobile_meram_ops;
 
+/*
+ * struct sh_mobile_meram_info - MERAM platform data
+ * @reserved_icbs: Bitmask of reserved ICBs (for instance used through UIO)
+ */
 struct sh_mobile_meram_info {
         int                             addr_mode;
+        u32                             reserved_icbs;
         struct sh_mobile_meram_ops      *ops;
         struct sh_mobile_meram_priv     *priv;
         struct platform_device          *pdev;
@@ -39,23 +44,23 @@ struct module;
 struct sh_mobile_meram_ops {
         struct module   *module;
         /* register usage of meram */
-        int (*meram_register)(struct sh_mobile_meram_info *meram_dev,
-                              const struct sh_mobile_meram_cfg *cfg,
-                              unsigned int xres, unsigned int yres,
-                              unsigned int pixelformat,
-                              unsigned long base_addr_y,
-                              unsigned long base_addr_c,
-                              unsigned long *icb_addr_y,
-                              unsigned long *icb_addr_c,
-                              unsigned int *pitch);
+        void *(*meram_register)(struct sh_mobile_meram_info *meram_dev,
+                                const struct sh_mobile_meram_cfg *cfg,
+                                unsigned int xres, unsigned int yres,
+                                unsigned int pixelformat,
+                                unsigned long base_addr_y,
+                                unsigned long base_addr_c,
+                                unsigned long *icb_addr_y,
+                                unsigned long *icb_addr_c,
+                                unsigned int *pitch);
 
         /* unregister usage of meram */
         int (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
-                                const struct sh_mobile_meram_cfg *cfg);
+                                void *data);
 
         /* update meram settings */
         int (*meram_update)(struct sh_mobile_meram_info *meram_dev,
-                            const struct sh_mobile_meram_cfg *cfg,
+                            void *data,
                             unsigned long base_addr_y,
                             unsigned long base_addr_c,
                             unsigned long *icb_addr_y,