sh_mobile_meram: MERAM framework for LCDC

Based on the patch by Takanari Hayama <taki@igel.co.jp>

Adds support framework necessary to use Media RAM (MERAM)
caching functionality with the LCDC.  The MERAM is accessed
through up to 4 Interconnect Buffers (ICBs).

ICB numbers and MERAM address ranges to use are specified in
by filling in the .meram_cfg member of the LCDC platform data

Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 70 insertions, 0 deletions

diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 2c8d369190b3..d964e68fc61d 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -2,6 +2,7 @@
 #define __ASM_SH_MOBILE_LCDC_H__
 
 #include <linux/fb.h>
+#include <video/sh_mobile_meram.h>
 
 enum {
         RGB8,   /* 24bpp, 8:8:8 */
@@ -87,11 +88,13 @@ struct sh_mobile_lcdc_chan_cfg {
         struct sh_mobile_lcdc_bl_info bl_info;
         struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */
         int nonstd;
+        struct sh_mobile_meram_cfg *meram_cfg;
 };
 
 struct sh_mobile_lcdc_info {
         int clock_source;
         struct sh_mobile_lcdc_chan_cfg ch[2];
+        struct sh_mobile_meram_info *meram_dev;
 };
 
 #endif /* __ASM_SH_MOBILE_LCDC_H__ */
diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
new file mode 100644
index 000000000000..15fbb3da266f
--- /dev/null
+++ b/include/video/sh_mobile_meram.h
@@ -0,0 +1,67 @@
+#ifndef __VIDEO_SH_MOBILE_MERAM_H__
+#define __VIDEO_SH_MOBILE_MERAM_H__
+
+/* For sh_mobile_meram_info.addr_mode */
+enum {
+        SH_MOBILE_MERAM_MODE0 = 0,
+        SH_MOBILE_MERAM_MODE1
+};
+
+enum {
+        SH_MOBILE_MERAM_PF_NV = 0,
+        SH_MOBILE_MERAM_PF_RGB
+};
+
+
+struct sh_mobile_meram_priv;
+struct sh_mobile_meram_ops;
+
+struct sh_mobile_meram_info {
+        int                             addr_mode;
+        struct sh_mobile_meram_ops      *ops;
+        struct sh_mobile_meram_priv     *priv;
+        struct platform_device          *pdev;
+};
+
+/* icb config */
+struct sh_mobile_meram_icb {
+        int marker_icb;         /* ICB # for Marker ICB */
+        int cache_icb;          /* ICB # for Cache ICB */
+        int meram_offset;       /* MERAM Buffer Offset to use */
+        int meram_size;         /* MERAM Buffer Size to use */
+
+        int cache_unit;         /* bytes to cache per ICB */
+};
+
+struct sh_mobile_meram_cfg {
+        struct sh_mobile_meram_icb      icb[2];
+        int                             pixelformat;
+        int                             current_reg;
+};
+
+struct module;
+struct sh_mobile_meram_ops {
+        struct module   *module;
+        /* register usage of meram */
+        int (*meram_register)(struct sh_mobile_meram_info *meram_dev,
+                              struct sh_mobile_meram_cfg *cfg,
+                              int xres, int yres, int pixelformat,
+                              unsigned long base_addr_y,
+                              unsigned long base_addr_c,
+                              unsigned long *icb_addr_y,
+                              unsigned long *icb_addr_c, int *pitch);
+
+        /* unregister usage of meram */
+        int (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
+                                struct sh_mobile_meram_cfg *cfg);
+
+        /* update meram settings */
+        int (*meram_update)(struct sh_mobile_meram_info *meram_dev,
+                            struct sh_mobile_meram_cfg *cfg,
+                            unsigned long base_addr_y,
+                            unsigned long base_addr_c,
+                            unsigned long *icb_addr_y,
+                            unsigned long *icb_addr_c);
+};
+
+#endif /* __VIDEO_SH_MOBILE_MERAM_H__  */