diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
| commit | c9e48084c88cf901ad0d99a889f2628a5622d90b (patch) | |
| tree | e95ef2305fa14e0c6e218a6aba8de8df4a0b5798 /drivers/staging/media/ipu3/include/intel-ipu3.h | |
| parent | regulator: axp20x: Use rdev_get_id at appropriate places (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.tar.xz linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.zip | |
Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
Diffstat (limited to 'drivers/staging/media/ipu3/include/intel-ipu3.h')
| -rw-r--r-- | drivers/staging/media/ipu3/include/intel-ipu3.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h index ec0b74829351..1e7184e4311d 100644 --- a/drivers/staging/media/ipu3/include/intel-ipu3.h +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h @@ -16,12 +16,6 @@ #define V4L2_CID_INTEL_IPU3_BASE (V4L2_CID_USER_BASE + 0x10c0) #define V4L2_CID_INTEL_IPU3_MODE (V4L2_CID_INTEL_IPU3_BASE + 1) -/* custom ctrl to set pipe mode */ -enum ipu3_running_mode { - IPU3_RUNNING_MODE_VIDEO = 0, - IPU3_RUNNING_MODE_STILL = 1, -}; - /******************* ipu3_uapi_stats_3a *******************/ #define IPU3_UAPI_MAX_STRIPES 2 @@ -438,11 +432,11 @@ struct ipu3_uapi_awb_fr_raw_buffer { * * @grid_cfg: grid config, default 16x16. * @bayer_coeff: 1D Filter 1x11 center symmetry/anti-symmetry. - * coeffcients defaults { 0, 0, 0, 0, 0, 128 }. + * coefficients defaults { 0, 0, 0, 0, 0, 128 }. * Applied on whole image for each Bayer channel separately * by a weighted sum of its 11x1 neighbors. * @reserved1: reserved - * @bayer_sign: sign of filter coeffcients, default 0. + * @bayer_sign: sign of filter coefficients, default 0. * @bayer_nf: normalization factor for the convolution coeffs, to make sure * total memory needed is within pre-determined range. * NF should be the log2 of the sum of the abs values of the |