sh_mobile_meram: Rename operations to cache_[alloc|free|update]

The MERAM operations meram_register, meram_unregister and meram_update
handle LCDC cache. In preparation for "raw" MERAM allocation, rename
them to more appropriate names.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 8 insertions, 13 deletions

diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index 29b2fd3b147e..8a5afaf2c6dc 100644
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -41,19 +41,14 @@ struct sh_mobile_meram_cfg {
 struct module;
 struct sh_mobile_meram_ops {
         struct module   *module;
-        /* register usage of meram */
-        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 int *pitch);
-
-        /* unregister usage of meram */
-        void (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
-                                 void *data);
-
-        /* update meram settings */
-        void (*meram_update)(struct sh_mobile_meram_info *meram_dev, void *data,
+
+        /* LCDC cache management */
+        void *(*cache_alloc)(struct sh_mobile_meram_info *meram_dev,
+                             const struct sh_mobile_meram_cfg *cfg,
+                             unsigned int xres, unsigned int yres,
+                             unsigned int pixelformat, unsigned int *pitch);
+        void (*cache_free)(struct sh_mobile_meram_info *meram_dev, void *data);
+        void (*cache_update)(struct sh_mobile_meram_info *meram_dev, void *data,
                              unsigned long base_addr_y,
                              unsigned long base_addr_c,
                              unsigned long *icb_addr_y,