fbdev: sh_mobile_meram: Replace hardcoded register values with macros

Instead of hardcoding register values through the driver, define macros
for individual register bits using the register name and the bit name,
and use the macros.

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

1 files changed, 71 insertions, 26 deletions

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index 39f28a1aa074..85577cf9ff58 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -20,22 +20,67 @@
 #include "sh_mobile_meram.h"
 
 /* meram registers */
-#define MExxCTL 0x0
-#define MExxBSIZE 0x4
-#define MExxMNCF 0x8
-#define MExxSARA 0x10
-#define MExxSARB 0x14
-#define MExxSBSIZE 0x18
-
-#define MERAM_MExxCTL_VAL(ctl, next_icb, addr)  \
-        ((ctl) | (((next_icb) & 0x1f) << 11) | (((addr) & 0x7ff) << 16))
-#define MERAM_MExxBSIZE_VAL(a, b, c) \
-        (((a) << 28) | ((b) << 16) | (c))
-
-#define MEVCR1 0x4
-#define MEACTS 0x10
-#define MEQSEL1 0x40
-#define MEQSEL2 0x44
+#define MEVCR1                  0x4
+#define MEVCR1_RST              (1 << 31)
+#define MEVCR1_WD               (1 << 30)
+#define MEVCR1_AMD1             (1 << 29)
+#define MEVCR1_AMD0             (1 << 28)
+#define MEQSEL1                 0x40
+#define MEQSEL2                 0x44
+
+#define MExxCTL                 0x400
+#define MExxCTL_BV              (1 << 31)
+#define MExxCTL_BSZ_SHIFT       28
+#define MExxCTL_MSAR_MASK       (0x7ff << MExxCTL_MSAR_SHIFT)
+#define MExxCTL_MSAR_SHIFT      16
+#define MExxCTL_NXT_MASK        (0x1f << MExxCTL_NXT_SHIFT)
+#define MExxCTL_NXT_SHIFT       11
+#define MExxCTL_WD1             (1 << 10)
+#define MExxCTL_WD0             (1 << 9)
+#define MExxCTL_WS              (1 << 8)
+#define MExxCTL_CB              (1 << 7)
+#define MExxCTL_WBF             (1 << 6)
+#define MExxCTL_WF              (1 << 5)
+#define MExxCTL_RF              (1 << 4)
+#define MExxCTL_CM              (1 << 3)
+#define MExxCTL_MD_READ         (1 << 0)
+#define MExxCTL_MD_WRITE        (2 << 0)
+#define MExxCTL_MD_ICB_WB       (3 << 0)
+#define MExxCTL_MD_ICB          (4 << 0)
+#define MExxCTL_MD_FB           (7 << 0)
+#define MExxCTL_MD_MASK         (7 << 0)
+#define MExxBSIZE               0x404
+#define MExxBSIZE_RCNT_SHIFT    28
+#define MExxBSIZE_YSZM1_SHIFT   16
+#define MExxBSIZE_XSZM1_SHIFT   0
+#define MExxMNCF                0x408
+#define MExxMNCF_KWBNM_SHIFT    28
+#define MExxMNCF_KRBNM_SHIFT    24
+#define MExxMNCF_BNM_SHIFT      16
+#define MExxMNCF_XBV            (1 << 15)
+#define MExxMNCF_CPL_YCBCR444   (1 << 12)
+#define MExxMNCF_CPL_YCBCR420   (2 << 12)
+#define MExxMNCF_CPL_YCBCR422   (3 << 12)
+#define MExxMNCF_CPL_MSK        (3 << 12)
+#define MExxMNCF_BL             (1 << 2)
+#define MExxMNCF_LNM_SHIFT      0
+#define MExxSARA                0x410
+#define MExxSARB                0x414
+#define MExxSBSIZE              0x418
+#define MExxSBSIZE_HDV          (1 << 31)
+#define MExxSBSIZE_HSZ16        (0 << 28)
+#define MExxSBSIZE_HSZ32        (1 << 28)
+#define MExxSBSIZE_HSZ64        (2 << 28)
+#define MExxSBSIZE_HSZ128       (3 << 28)
+#define MExxSBSIZE_SBSIZZ_SHIFT 0
+
+#define MERAM_MExxCTL_VAL(next, addr)   \
+        ((((next) << MExxCTL_NXT_SHIFT) & MExxCTL_NXT_MASK) | \
+         (((addr) << MExxCTL_MSAR_SHIFT) & MExxCTL_MSAR_MASK))
+#define MERAM_MExxBSIZE_VAL(rcnt, yszm1, xszm1) \
+        (((rcnt) << MExxBSIZE_RCNT_SHIFT) | \
+         ((yszm1) << MExxBSIZE_YSZM1_SHIFT) | \
+         ((xszm1) << MExxBSIZE_XSZM1_SHIFT))
 
 static unsigned long common_regs[] = {
         MEVCR1,
@@ -72,8 +117,7 @@ struct sh_mobile_meram_priv {
  * MERAM/ICB access functions
  */
 
-#define MERAM_ICB_OFFSET(base, idx, off)        \
-        ((base) + (0x400 + ((idx) * 0x20) + (off)))
+#define MERAM_ICB_OFFSET(base, idx, off)        ((base) + (off) + (idx) * 0x20)
 
 static inline void meram_write_icb(void __iomem *base, int idx, int off,
         unsigned long val)
@@ -308,17 +352,18 @@ static int meram_init(struct sh_mobile_meram_priv *priv,
         /*
          * Set MERAM for framebuffer
          *
-         * 0x70f:  WD = 0x3, WS=0x1, CM=0x1, MD=FB mode
          * we also chain the cache_icb and the marker_icb.
          * we also split the allocated MERAM buffer between two ICBs.
          */
         meram_write_icb(priv->base, icb->cache_icb, MExxCTL,
-                        MERAM_MExxCTL_VAL(0x70f, icb->marker_icb,
-                                          icb->meram_offset));
+                        MERAM_MExxCTL_VAL(icb->marker_icb, icb->meram_offset) |
+                        MExxCTL_WD1 | MExxCTL_WD0 | MExxCTL_WS | MExxCTL_CM |
+                        MExxCTL_MD_FB);
         meram_write_icb(priv->base, icb->marker_icb, MExxCTL,
-                        MERAM_MExxCTL_VAL(0x70f, icb->cache_icb,
-                                          icb->meram_offset +
-                                          icb->meram_size / 2));
+                        MERAM_MExxCTL_VAL(icb->cache_icb, icb->meram_offset +
+                                          icb->meram_size / 2) |
+                        MExxCTL_WD1 | MExxCTL_WD0 | MExxCTL_WS | MExxCTL_CM |
+                        MExxCTL_MD_FB);
 
         return 0;
 }
@@ -507,7 +552,7 @@ static int sh_mobile_meram_runtime_suspend(struct device *dev)
                         /* Reset ICB on resume */
                         if (icb_regs[k] == MExxCTL)
                                 priv->icb_saved_regs[j * ICB_REGS_SIZE + k] =
-                                        0x70;
+                                        MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF;
                 }
         }
         return 0;
@@ -592,7 +637,7 @@ static int __devinit sh_mobile_meram_probe(struct platform_device *pdev)
 
         /* initialize ICB addressing mode */
         if (pdata->addr_mode == SH_MOBILE_MERAM_MODE1)
-                meram_write_reg(priv->base, MEVCR1, 1 << 29);
+                meram_write_reg(priv->base, MEVCR1, MEVCR1_AMD1);
 
         pm_runtime_enable(&pdev->dev);