Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / drivers / media / platform / vsp1 / vsp1_regs.h

diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index 47b1dee044fb37a005bc6c6fe6077c5055785fdd..cd3e32af6e3b5cf572614b129578cb9e1db3c085 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -328,8 +328,8 @@
 #define VI6_DPR_ROUTE_RT_MASK          (0x3f << 0)
 #define VI6_DPR_ROUTE_RT_SHIFT         0
 
-#define VI6_DPR_HGO_SMPPT              0x2050
-#define VI6_DPR_HGT_SMPPT              0x2054
+#define VI6_DPR_HGO_SMPPT              0x2054
+#define VI6_DPR_HGT_SMPPT              0x2058
 #define VI6_DPR_SMPPT_TGW_MASK         (7 << 8)
 #define VI6_DPR_SMPPT_TGW_SHIFT                8
 #define VI6_DPR_SMPPT_PT_MASK          (0x3f << 0)
@@ -590,33 +590,55 @@
  */
 
 #define VI6_HGO_OFFSET                 0x3000
+#define VI6_HGO_OFFSET_HOFFSET_SHIFT   16
+#define VI6_HGO_OFFSET_VOFFSET_SHIFT   0
 #define VI6_HGO_SIZE                   0x3004
+#define VI6_HGO_SIZE_HSIZE_SHIFT       16
+#define VI6_HGO_SIZE_VSIZE_SHIFT       0
 #define VI6_HGO_MODE                   0x3008
+#define VI6_HGO_MODE_STEP              (1 << 10)
+#define VI6_HGO_MODE_MAXRGB            (1 << 7)
+#define VI6_HGO_MODE_OFSB_R            (1 << 6)
+#define VI6_HGO_MODE_OFSB_G            (1 << 5)
+#define VI6_HGO_MODE_OFSB_B            (1 << 4)
+#define VI6_HGO_MODE_HRATIO_SHIFT      2
+#define VI6_HGO_MODE_VRATIO_SHIFT      0
 #define VI6_HGO_LB_TH                  0x300c
 #define VI6_HGO_LBn_H(n)               (0x3010 + (n) * 8)
 #define VI6_HGO_LBn_V(n)               (0x3014 + (n) * 8)
-#define VI6_HGO_R_HISTO                        0x3030
+#define VI6_HGO_R_HISTO(n)             (0x3030 + (n) * 4)
 #define VI6_HGO_R_MAXMIN               0x3130
 #define VI6_HGO_R_SUM                  0x3134
 #define VI6_HGO_R_LB_DET               0x3138
-#define VI6_HGO_G_HISTO                        0x3140
+#define VI6_HGO_G_HISTO(n)             (0x3140 + (n) * 4)
 #define VI6_HGO_G_MAXMIN               0x3240
 #define VI6_HGO_G_SUM                  0x3244
 #define VI6_HGO_G_LB_DET               0x3248
-#define VI6_HGO_B_HISTO                        0x3250
+#define VI6_HGO_B_HISTO(n)             (0x3250 + (n) * 4)
 #define VI6_HGO_B_MAXMIN               0x3350
 #define VI6_HGO_B_SUM                  0x3354
 #define VI6_HGO_B_LB_DET               0x3358
+#define VI6_HGO_EXT_HIST_ADDR          0x335c
+#define VI6_HGO_EXT_HIST_DATA          0x3360
 #define VI6_HGO_REGRST                 0x33fc
+#define VI6_HGO_REGRST_RCLEA           (1 << 0)
 
 /* -----------------------------------------------------------------------------
  * HGT Control Registers
  */
 
 #define VI6_HGT_OFFSET                 0x3400
+#define VI6_HGT_OFFSET_HOFFSET_SHIFT   16
+#define VI6_HGT_OFFSET_VOFFSET_SHIFT   0
 #define VI6_HGT_SIZE                   0x3404
+#define VI6_HGT_SIZE_HSIZE_SHIFT       16
+#define VI6_HGT_SIZE_VSIZE_SHIFT       0
 #define VI6_HGT_MODE                   0x3408
+#define VI6_HGT_MODE_HRATIO_SHIFT      2
+#define VI6_HGT_MODE_VRATIO_SHIFT      0
 #define VI6_HGT_HUE_AREA(n)            (0x340c + (n) * 4)
+#define VI6_HGT_HUE_AREA_LOWER_SHIFT   16
+#define VI6_HGT_HUE_AREA_UPPER_SHIFT   0
 #define VI6_HGT_LB_TH                  0x3424
 #define VI6_HGT_LBn_H(n)               (0x3438 + (n) * 8)
 #define VI6_HGT_LBn_V(n)               (0x342c + (n) * 8)
@@ -625,6 +647,7 @@
 #define VI6_HGT_SUM                    0x3754
 #define VI6_HGT_LB_DET                 0x3758
 #define VI6_HGT_REGRST                 0x37fc
+#define VI6_HGT_REGRST_RCLEA           (1 << 0)
 
 /* -----------------------------------------------------------------------------
  * LIF Control Registers