tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Hans Verkuil
and committed by
Mauro Carvalho Chehab
db242f62
1de19519
+12
-12
+5
-5
drivers/media/platform/davinci/dm355_ccdc.c
+5
-5
drivers/media/platform/davinci/dm355_ccdc.c
···
85
85
.mfilt1 = CCDC_NO_MEDIAN_FILTER1,
86
86
.mfilt2 = CCDC_NO_MEDIAN_FILTER2,
87
87
.alaw = {
88
-
.gama_wd = 2,
88
+
.gamma_wd = 2,
89
89
},
90
90
.blk_clamp = {
91
91
.sample_pixel = 1,
···
303
303
}
304
304
305
305
if (ccdcparam->alaw.enable) {
306
-
if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 ||
307
-
ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) {
306
+
if (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_13_4 ||
307
+
ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) {
308
308
dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n");
309
309
return -EINVAL;
310
310
}
···
680
680
/* Enable and configure aLaw register if needed */
681
681
if (config_params->alaw.enable) {
682
682
val |= (CCDC_ALAW_ENABLE |
683
-
((config_params->alaw.gama_wd &
684
-
CCDC_ALAW_GAMA_WD_MASK) <<
683
+
((config_params->alaw.gamma_wd &
684
+
CCDC_ALAW_GAMMA_WD_MASK) <<
685
685
CCDC_GAMMAWD_INPUT_SHIFT));
686
686
}
687
687
+1
-1
drivers/media/platform/davinci/dm355_ccdc_regs.h
+1
-1
drivers/media/platform/davinci/dm355_ccdc_regs.h
+1
-1
drivers/media/platform/davinci/isif.c
+1
-1
drivers/media/platform/davinci/isif.c
···
604
604
if (module_params->compress.alg == ISIF_ALAW)
605
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
608
regw(val, CGAMMAWD);
609
609
610
610
/* Configure DPCM compression settings */
+2
-2
drivers/media/platform/davinci/isif_regs.h
+2
-2
drivers/media/platform/davinci/isif_regs.h
···
203
203
#define ISIF_LPF_MASK 1
204
204
205
205
/* GAMMAWD registers */
206
-
#define ISIF_ALAW_GAMA_WD_MASK 0xF
207
-
#define ISIF_ALAW_GAMA_WD_SHIFT 1
206
+
#define ISIF_ALAW_GAMMA_WD_MASK 0xF
207
+
#define ISIF_ALAW_GAMMA_WD_SHIFT 1
208
208
#define ISIF_ALAW_ENABLE 1
209
209
#define ISIF_GAMMAWD_CFA_SHIFT 5
210
210
+3
-3
include/media/davinci/dm355_ccdc.h
+3
-3
include/media/davinci/dm355_ccdc.h
···
38
38
CCDC_SAMPLE_16LINES
39
39
};
40
40
41
-
/* enum for Alaw gama width */
41
+
/* enum for Alaw gamma width */
42
42
enum ccdc_gamma_width {
43
43
CCDC_GAMMA_BITS_13_4,
44
44
CCDC_GAMMA_BITS_12_3,
···
97
97
struct ccdc_a_law {
98
98
/* Enable/disable A-Law */
99
99
unsigned char enable;
100
-
/* Gama Width Input */
101
-
enum ccdc_gamma_width gama_wd;
100
+
/* Gamma Width Input */
101
+
enum ccdc_gamma_width gamma_wd;
102
102
};
103
103
104
104
/* structure for Black Clamping */