aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-04 05:24:07 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-19 15:16:23 -0400
commitdb242f62bd18f6c689c0e04f3df14be2deb89462 (patch)
tree6dfa37fdbc62c6623c3ef9c298594385bd27f7d8
parent1de1951930d4450d1645a0a907b710f268af42c3 (diff)
[media] davinci: more gama -> gamma typo fixes
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/platform/davinci/dm355_ccdc.c10
-rw-r--r--drivers/media/platform/davinci/dm355_ccdc_regs.h2
-rw-r--r--drivers/media/platform/davinci/isif.c2
-rw-r--r--drivers/media/platform/davinci/isif_regs.h4
-rw-r--r--include/media/davinci/dm355_ccdc.h6
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index 4277e4ad810c..2364dbab8046 100644
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -85,7 +85,7 @@ static struct ccdc_oper_config {
85 .mfilt1 = CCDC_NO_MEDIAN_FILTER1, 85 .mfilt1 = CCDC_NO_MEDIAN_FILTER1,
86 .mfilt2 = CCDC_NO_MEDIAN_FILTER2, 86 .mfilt2 = CCDC_NO_MEDIAN_FILTER2,
87 .alaw = { 87 .alaw = {
88 .gama_wd = 2, 88 .gamma_wd = 2,
89 }, 89 },
90 .blk_clamp = { 90 .blk_clamp = {
91 .sample_pixel = 1, 91 .sample_pixel = 1,
@@ -303,8 +303,8 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
303 } 303 }
304 304
305 if (ccdcparam->alaw.enable) { 305 if (ccdcparam->alaw.enable) {
306 if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 || 306 if (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_13_4 ||
307 ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) { 307 ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) {
308 dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n"); 308 dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n");
309 return -EINVAL; 309 return -EINVAL;
310 } 310 }
@@ -680,8 +680,8 @@ static int ccdc_config_raw(void)
680 /* Enable and configure aLaw register if needed */ 680 /* Enable and configure aLaw register if needed */
681 if (config_params->alaw.enable) { 681 if (config_params->alaw.enable) {
682 val |= (CCDC_ALAW_ENABLE | 682 val |= (CCDC_ALAW_ENABLE |
683 ((config_params->alaw.gama_wd & 683 ((config_params->alaw.gamma_wd &
684 CCDC_ALAW_GAMA_WD_MASK) << 684 CCDC_ALAW_GAMMA_WD_MASK) <<
685 CCDC_GAMMAWD_INPUT_SHIFT)); 685 CCDC_GAMMAWD_INPUT_SHIFT));
686 } 686 }
687 687
diff --git a/drivers/media/platform/davinci/dm355_ccdc_regs.h b/drivers/media/platform/davinci/dm355_ccdc_regs.h
index d6d2ef0533b5..2e1946e0b99f 100644
--- a/drivers/media/platform/davinci/dm355_ccdc_regs.h
+++ b/drivers/media/platform/davinci/dm355_ccdc_regs.h
@@ -153,7 +153,7 @@
153#define CCDC_VDHDEN_ENABLE (1 << 16) 153#define CCDC_VDHDEN_ENABLE (1 << 16)
154#define CCDC_LPF_ENABLE (1 << 14) 154#define CCDC_LPF_ENABLE (1 << 14)
155#define CCDC_ALAW_ENABLE 1 155#define CCDC_ALAW_ENABLE 1
156#define CCDC_ALAW_GAMA_WD_MASK 7 156#define CCDC_ALAW_GAMMA_WD_MASK 7
157#define CCDC_REC656IF_BT656_EN 3 157#define CCDC_REC656IF_BT656_EN 3
158 158
159#define CCDC_FMTCFG_FMTMODE_MASK 3 159#define CCDC_FMTCFG_FMTMODE_MASK 3
diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c
index 5050f9265f48..abc3ae36645c 100644
--- a/drivers/media/platform/davinci/isif.c
+++ b/drivers/media/platform/davinci/isif.c
@@ -604,7 +604,7 @@ static int isif_config_raw(void)
604 if (module_params->compress.alg == ISIF_ALAW) 604 if (module_params->compress.alg == ISIF_ALAW)
605 val |= ISIF_ALAW_ENABLE; 605 val |= ISIF_ALAW_ENABLE;
606 606
607 val |= (params->data_msb << ISIF_ALAW_GAMA_WD_SHIFT); 607 val |= (params->data_msb << ISIF_ALAW_GAMMA_WD_SHIFT);
608 regw(val, CGAMMAWD); 608 regw(val, CGAMMAWD);
609 609
610 /* Configure DPCM compression settings */ 610 /* Configure DPCM compression settings */
diff --git a/drivers/media/platform/davinci/isif_regs.h b/drivers/media/platform/davinci/isif_regs.h
index aa69a463c122..3993aece821b 100644
--- a/drivers/media/platform/davinci/isif_regs.h
+++ b/drivers/media/platform/davinci/isif_regs.h
@@ -203,8 +203,8 @@
203#define ISIF_LPF_MASK 1 203#define ISIF_LPF_MASK 1
204 204
205/* GAMMAWD registers */ 205/* GAMMAWD registers */
206#define ISIF_ALAW_GAMA_WD_MASK 0xF 206#define ISIF_ALAW_GAMMA_WD_MASK 0xF
207#define ISIF_ALAW_GAMA_WD_SHIFT 1 207#define ISIF_ALAW_GAMMA_WD_SHIFT 1
208#define ISIF_ALAW_ENABLE 1 208#define ISIF_ALAW_ENABLE 1
209#define ISIF_GAMMAWD_CFA_SHIFT 5 209#define ISIF_GAMMAWD_CFA_SHIFT 5
210 210
diff --git a/include/media/davinci/dm355_ccdc.h b/include/media/davinci/dm355_ccdc.h
index adf2fe4bf0bb..c669a9fb75e5 100644
--- a/include/media/davinci/dm355_ccdc.h
+++ b/include/media/davinci/dm355_ccdc.h
@@ -38,7 +38,7 @@ enum ccdc_sample_line {
38 CCDC_SAMPLE_16LINES 38 CCDC_SAMPLE_16LINES
39}; 39};
40 40
41/* enum for Alaw gama width */ 41/* enum for Alaw gamma width */
42enum ccdc_gamma_width { 42enum ccdc_gamma_width {
43 CCDC_GAMMA_BITS_13_4, 43 CCDC_GAMMA_BITS_13_4,
44 CCDC_GAMMA_BITS_12_3, 44 CCDC_GAMMA_BITS_12_3,
@@ -97,8 +97,8 @@ enum ccdc_mfilt2 {
97struct ccdc_a_law { 97struct ccdc_a_law {
98 /* Enable/disable A-Law */ 98 /* Enable/disable A-Law */
99 unsigned char enable; 99 unsigned char enable;
100 /* Gama Width Input */ 100 /* Gamma Width Input */
101 enum ccdc_gamma_width gama_wd; 101 enum ccdc_gamma_width gamma_wd;
102}; 102};
103 103
104/* structure for Black Clamping */ 104/* structure for Black Clamping */