AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-03 05:57:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] davinci: more gama -> gamma typo fixes

Browse Source 
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>
This commit is contained in:
Hans Verkuil 2013-03-04 07:24:07 -03:00 committed by Mauro Carvalho Chehab
parent 1de1951930
commit db242f62bd
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/platform/davinci/dm355_ccdc.c
View File

@ -85,7 +85,7 @@ static struct ccdc_oper_config {
.mfilt1 = CCDC_NO_MEDIAN_FILTER1, .mfilt1 = CCDC_NO_MEDIAN_FILTER1,
.mfilt2 = CCDC_NO_MEDIAN_FILTER2, .mfilt2 = CCDC_NO_MEDIAN_FILTER2,
.alaw = { .alaw = {
.gama_wd = 2, .gamma_wd = 2,
}, },
.blk_clamp = { .blk_clamp = {
.sample_pixel = 1, .sample_pixel = 1,
@ -303,8 +303,8 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
} }
if (ccdcparam->alaw.enable) { if (ccdcparam->alaw.enable) {
if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 || if (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_13_4 ||
ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) { ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) {
dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n"); dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n");
return -EINVAL; return -EINVAL;
} }
@ -680,8 +680,8 @@ static int ccdc_config_raw(void)
/* Enable and configure aLaw register if needed */ /* Enable and configure aLaw register if needed */
if (config_params->alaw.enable) { if (config_params->alaw.enable) {
val |= (CCDC_ALAW_ENABLE | val |= (CCDC_ALAW_ENABLE |
((config_params->alaw.gama_wd & ((config_params->alaw.gamma_wd &
CCDC_ALAW_GAMA_WD_MASK) << CCDC_ALAW_GAMMA_WD_MASK) <<
CCDC_GAMMAWD_INPUT_SHIFT)); CCDC_GAMMAWD_INPUT_SHIFT));
} }

2
drivers/media/platform/davinci/dm355_ccdc_regs.h
View File

@ -153,7 +153,7 @@
#define CCDC_VDHDEN_ENABLE (1 << 16) #define CCDC_VDHDEN_ENABLE (1 << 16)
#define CCDC_LPF_ENABLE (1 << 14) #define CCDC_LPF_ENABLE (1 << 14)
#define CCDC_ALAW_ENABLE 1 #define CCDC_ALAW_ENABLE 1
#define CCDC_ALAW_GAMA_WD_MASK 7 #define CCDC_ALAW_GAMMA_WD_MASK 7
#define CCDC_REC656IF_BT656_EN 3 #define CCDC_REC656IF_BT656_EN 3
#define CCDC_FMTCFG_FMTMODE_MASK 3 #define CCDC_FMTCFG_FMTMODE_MASK 3

2
drivers/media/platform/davinci/isif.c
View File

@ -604,7 +604,7 @@ static int isif_config_raw(void)
if (module_params->compress.alg == ISIF_ALAW) if (module_params->compress.alg == ISIF_ALAW)
val |= ISIF_ALAW_ENABLE; val |= ISIF_ALAW_ENABLE;
val |= (params->data_msb << ISIF_ALAW_GAMA_WD_SHIFT); val |= (params->data_msb << ISIF_ALAW_GAMMA_WD_SHIFT);
regw(val, CGAMMAWD); regw(val, CGAMMAWD);
/* Configure DPCM compression settings */ /* Configure DPCM compression settings */

4
drivers/media/platform/davinci/isif_regs.h
View File

@ -203,8 +203,8 @@
#define ISIF_LPF_MASK 1 #define ISIF_LPF_MASK 1
/* GAMMAWD registers */ /* GAMMAWD registers */
#define ISIF_ALAW_GAMA_WD_MASK 0xF #define ISIF_ALAW_GAMMA_WD_MASK 0xF
#define ISIF_ALAW_GAMA_WD_SHIFT 1 #define ISIF_ALAW_GAMMA_WD_SHIFT 1
#define ISIF_ALAW_ENABLE 1 #define ISIF_ALAW_ENABLE 1
#define ISIF_GAMMAWD_CFA_SHIFT 5 #define ISIF_GAMMAWD_CFA_SHIFT 5

6
include/media/davinci/dm355_ccdc.h
View File

@ -38,7 +38,7 @@ enum ccdc_sample_line {
CCDC_SAMPLE_16LINES CCDC_SAMPLE_16LINES
}; };
/* enum for Alaw gama width */ /* enum for Alaw gamma width */
enum ccdc_gamma_width { enum ccdc_gamma_width {
CCDC_GAMMA_BITS_13_4, CCDC_GAMMA_BITS_13_4,
CCDC_GAMMA_BITS_12_3, CCDC_GAMMA_BITS_12_3,
@ -97,8 +97,8 @@ enum ccdc_mfilt2 {
struct ccdc_a_law { struct ccdc_a_law {
/* Enable/disable A-Law */ /* Enable/disable A-Law */
unsigned char enable; unsigned char enable;
/* Gama Width Input */ /* Gamma Width Input */
enum ccdc_gamma_width gama_wd; enum ccdc_gamma_width gamma_wd;
}; };
/* structure for Black Clamping */ /* structure for Black Clamping */